Commit 0d367041 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Elimina recursos dedicados a Elasticsearch v5

See merge request redmic-project/elastic/curator!14
parents ae7f6f6b e7f69ee1

.gitlab-ci.yml

+0 −64
Original line number Diff line number Diff line
@@ -148,73 +148,9 @@ deploy-curator-restore-stable-branch-production: 
  extends: .deploy-curator-restore-production

  <<: *deploy-curator-restore-stable-branch



# Old-curator deployment

# Jobs temporales, hasta unificar Elasticsearch v5 y v6



.deploy-old-curator:

  variables: &deploy-old-curator-variables

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_old-${CI_PROJECT_NAME}



.deploy-old-curator-development:

  extends: .deploy-development

  variables:

    COMPOSE_FILE: docker-compose.old-${CI_PROJECT_NAME}.tmpl.yml:docker-compose.old-${CI_PROJECT_NAME}.dev.yml

    <<: *deploy-old-curator-variables

  environment:

    name: dev/old-${CI_PROJECT_NAME}



.deploy-old-curator-production:

  extends: .deploy-production

  variables:

    COMPOSE_FILE: docker-compose.old-${CI_PROJECT_NAME}.tmpl.yml:docker-compose.old-${CI_PROJECT_NAME}.prod.yml

    <<: *deploy-old-curator-variables

  environment:

    name: pro/old-${CI_PROJECT_NAME}



.deploy-old-curator-support-branch: &deploy-old-curator-support-branch

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_PIPELINE_SOURCE == "web" ||

          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH

      when: manual

      allow_failure: true



deploy-old-curator-support-branch-development:

  extends: .deploy-old-curator-development

  <<: *deploy-old-curator-support-branch



.deploy-old-curator-stable-branch: &deploy-old-curator-stable-branch

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_PIPELINE_SOURCE == "web"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

      when: manual

      allow_failure: true



deploy-old-curator-stable-branch-development:

  extends: .deploy-old-curator-development

  <<: *deploy-old-curator-stable-branch



deploy-old-curator-stable-branch-production:

  extends: .deploy-old-curator-production

  <<: *deploy-old-curator-stable-branch



# Maintenance



.scheduled-run:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICE: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}
 


# Job temporal, hasta unificar Elasticsearch v5 y v6

scheduled-run-old-curator-production:

  extends: scheduled-run-production

  variables:

    SERVICE: ${PROJECT_PARENT_NAME}_old-${CI_PROJECT_NAME}

deploy/docker-compose.old-curator.dev.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.5'

deploy/docker-compose.old-curator.prod.yml

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
version: '3.5'



services:

  old-curator:

    deploy:

      placement:

        constraints:

          - node.role == worker

deploy/docker-compose.old-curator.tmpl.yml

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
version: '3.5'



services:

  old-curator:

    image: ${IMAGE_NAME:-bobrik/curator}:${IMAGE_TAG:-latest}

    command: ${CURATOR_ACTIONS_PATH}

    environment:

      ELASTICSEARCH_URL:

      ELASTICSEARCH_AUTH: ${ES_USER}:${ES_PASS}

      ELASTICSEARCH_PORT:

      CURATOR_TIMEOUT:

      SNAPSHOT_REPOSITORY:

      DELETE_OLD_LOGS_DISABLE: 'True'

      SNAPSHOT_DISABLE: 'False'

      DELETE_OLD_SNAPSHOTS_DISABLE: 'True'

      RESTORE_SNAPSHOT_DISABLE: 'True'

    networks:

      elastic-net:

    configs:

      - source: curator-config

        target: ${CURATOR_CONFIG_PATH}

      - source: curator-actions

        target: ${CURATOR_ACTIONS_PATH}

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      restart_policy:

        condition: on-failure

        delay: ${RESTART_DELAY:-10s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-64M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-32M}



networks:

  elastic-net:

    name: ${ELASTIC_NET_NAME}

    driver: ${ELASTIC_NET_DRIVER}

    external: true



configs:

  curator-config:

    name: ${CURATOR_CONFIG_CONFIG_NAME}

    file: ./config/curator.yml



  curator-actions:

    name: ${CURATOR_ACTIONS_CONFIG_NAME}

    file: ./config/actions.yml