Commit b01d9d65 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Habilita mantenimiento en prod, permite paso vars. 

Agrega la tarea programada de backup también para el servicio
old-curator.
Redefine valores por defecto en ficheros deploy. Tal como estaban
impedían su definiciíon desde fuera.
parent f5a9c4ee

.gitlab-ci.yml

+11 −3
Original line number Diff line number Diff line
@@ -141,6 +141,16 @@ scheduled-run-curator-production: 
  only:

    - schedules



# El siguiente job es temporal, hasta que se unifiquen elasticsearch v5 y v6

scheduled-run-old-curator-production:

  stage: maintenance

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: elastic_old-curator

  script: relaunch.sh

  only:

    - schedules



deploy-curator-restore-develop:

  stage: deploy

  variables:
@@ -190,13 +200,11 @@ deploy-old-curator-supporting-branch-production: 
    SNAPSHOT_DISABLE: 'False'

    DELETE_OLD_LOGS_DISABLE: 'True'

    DELETE_OLD_SNAPSHOTS_DISABLE: 'True'

    RESTORE_SNAPSHOT_DISABLE: 'True'

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} ELASTICSEARCH_URL=${ELASTICSEARCH_URL}

      DELETE_OLD_LOGS_DISABLE=${DELETE_OLD_LOGS_DISABLE} SNAPSHOT_DISABLE=${SNAPSHOT_DISABLE}

      DELETE_OLD_SNAPSHOTS_DISABLE=${DELETE_OLD_SNAPSHOTS_DISABLE} RESTORE_SNAPSHOT_DISABLE=${RESTORE_SNAPSHOT_DISABLE}

      SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY}

      DELETE_OLD_SNAPSHOTS_DISABLE=${DELETE_OLD_SNAPSHOTS_DISABLE} SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY}

  environment:

    name: pro/old-curator

  only:

deploy/.env

+4 −0
Original line number Diff line number Diff line
@@ -9,3 +9,7 @@ DELETE_OLD_SNAPSHOTS_DAYS_COUNT=90 
SNAPSHOT_RESTORE_NAME=

SNAPSHOT_RESTORE_INDICES=index.name

SNAPSHOT_RESTORE_INCLUDE_ALIASES=True

DELETE_OLD_LOGS_DISABLE=False

SNAPSHOT_DISABLE=False

DELETE_OLD_SNAPSHOTS_DISABLE=False

RESTORE_SNAPSHOT_DISABLE=True

deploy/docker-compose.curator.tmpl.yml

+4 −4
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ services: 
      - DELETE_OLD_LOGS_DAYS_COUNT

      - SNAPSHOT_REPOSITORY

      - DELETE_OLD_SNAPSHOTS_DAYS_COUNT

      - DELETE_OLD_LOGS_DISABLE=False

      - SNAPSHOT_DISABLE=False

      - DELETE_OLD_SNAPSHOTS_DISABLE=False

      - RESTORE_SNAPSHOT_DISABLE=True

      - DELETE_OLD_LOGS_DISABLE

      - SNAPSHOT_DISABLE

      - DELETE_OLD_SNAPSHOTS_DISABLE

      - RESTORE_SNAPSHOT_DISABLE

    networks:

      - elastic-net

    configs:

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

+4 −4
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ services: 
      - DELETE_OLD_LOGS_DAYS_COUNT

      - SNAPSHOT_REPOSITORY

      - DELETE_OLD_SNAPSHOTS_DAYS_COUNT

      - DELETE_OLD_LOGS_DISABLE=False

      - SNAPSHOT_DISABLE=False

      - DELETE_OLD_SNAPSHOTS_DISABLE=False

      - RESTORE_SNAPSHOT_DISABLE=True

      - DELETE_OLD_LOGS_DISABLE

      - SNAPSHOT_DISABLE

      - DELETE_OLD_SNAPSHOTS_DISABLE

      - RESTORE_SNAPSHOT_DISABLE

    networks:

      - elastic-net

    configs: