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

Restaura también los alias, actualiza CI y deploy 

Los snapshots ya contienen siempre los alias de índices, pero la
restauración los omitía por defecto.
Reduce límites de memoria y actualiza paso de variables al nuevo
servicio old-curator.
parent dd01af49

.gitlab-ci.yml

+3 −5
Original line number Diff line number Diff line
@@ -187,18 +187,16 @@ deploy-old-curator-supporting-branch-production: 
    SERVICES_TO_CHECK: elastic_old-curator

    COMPOSE_FILE: docker-compose.old-curator.tmpl.yml:docker-compose.old-curator.prod.yml

    ELASTICSEARCH_URL: http://es-1

    ELASTICSEARCH_AUTH: ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}

    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} ELASTICSEARCH_AUTH="${ELASTICSEARCH_AUTH}"

      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} RESTORE_SNAPSHOT_DISABLE=${RESTORE_SNAPSHOT_DISABLE}

      SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY}

  environment:

    name: pro/old-curator

  only:

deploy/.env

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ SNAPSHOT_REPOSITORY=s3-backup 
DELETE_OLD_SNAPSHOTS_DAYS_COUNT=90

SNAPSHOT_RESTORE_NAME=

SNAPSHOT_RESTORE_INDICES=index.name

SNAPSHOT_RESTORE_INCLUDE_ALIASES=True

deploy/config/actions.yml

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ actions: 
      name: ${SNAPSHOT_RESTORE_NAME}

      indices:

      - ${SNAPSHOT_RESTORE_INDICES}

      include_aliases: ${SNAPSHOT_RESTORE_INCLUDE_ALIASES:True}

      wait_interval: 30

      disable_action: ${RESTORE_SNAPSHOT_DISABLE:True}

    filters:

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

+3 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ services: 
      - SNAPSHOT_REPOSITORY

      - SNAPSHOT_RESTORE_NAME

      - SNAPSHOT_RESTORE_INDICES

      - SNAPSHOT_RESTORE_INCLUDE_ALIASES

      - DELETE_OLD_LOGS_DISABLE=True

      - SNAPSHOT_DISABLE=True

      - DELETE_OLD_SNAPSHOTS_DISABLE=True
@@ -31,9 +32,9 @@ services: 
      resources:

        limits:

          cpus: '0.1'

          memory: 128M

          memory: 64M

        reservations:

          memory: 103M

          memory: 32M



networks:

  elastic-net:

deploy/docker-compose.curator.tmpl.yml

+2 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ services: 
      resources:

        limits:

          cpus: '0.1'

          memory: 128M

          memory: 64M

        reservations:

          memory: 103M

          memory: 32M



networks:

  elastic-net: