Commit 85ccbcc2 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/elastic/curator!10
parents f78f5b21 9a3e85cc

.gitlab-ci.yml

+12 −12
Original line number Diff line number Diff line
@@ -23,16 +23,16 @@ deploy-curator-supporting-branch-develop: 
    COMPOSE_FILE: docker-compose.curator.tmpl.yml:docker-compose.curator.dev.yml

    ELASTICSEARCH_AUTH: ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}

    DELETE_OLD_LOGS_DISABLE: 'False'

    SNAPSHOT_DISABLE: 'False'

    DELETE_OLD_SNAPSHOTS_DISABLE: 'False'

    SNAPSHOT_DISABLE: 'True'

    DELETE_OLD_SNAPSHOTS_DISABLE: 'True'

  script:

    - >

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

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_AUTH=${ELASTICSEARCH_AUTH}

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

      DELETE_OLD_SNAPSHOTS_DISABLE=${DELETE_OLD_SNAPSHOTS_DISABLE} LOG_INDEX_PREFIX=${LOG_INDEX_PREFIX}

      DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT} SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY}

      DELETE_OLD_SNAPSHOTS_DAYS_COUNT=${DELETE_OLD_SNAPSHOTS_DAYS_COUNT}

      DELETE_OLD_LOGS_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT}

      SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY} DELETE_OLD_SNAPSHOTS_DAYS_COUNT=${DELETE_OLD_SNAPSHOTS_DAYS_COUNT}

  environment:

    name: dev/curator

  only:
@@ -51,16 +51,16 @@ deploy-curator-stable-branch-develop: 
    COMPOSE_FILE: docker-compose.curator.tmpl.yml:docker-compose.curator.dev.yml

    ELASTICSEARCH_AUTH: ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}

    DELETE_OLD_LOGS_DISABLE: 'False'

    SNAPSHOT_DISABLE: 'False'

    DELETE_OLD_SNAPSHOTS_DISABLE: 'False'

    SNAPSHOT_DISABLE: 'True'

    DELETE_OLD_SNAPSHOTS_DISABLE: 'True'

  script:

    - >

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

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_AUTH=${ELASTICSEARCH_AUTH}

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

      DELETE_OLD_SNAPSHOTS_DISABLE=${DELETE_OLD_SNAPSHOTS_DISABLE} LOG_INDEX_PREFIX=${LOG_INDEX_PREFIX}

      DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT} SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY}

      DELETE_OLD_SNAPSHOTS_DAYS_COUNT=${DELETE_OLD_SNAPSHOTS_DAYS_COUNT}

      DELETE_OLD_LOGS_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT}

      SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY} DELETE_OLD_SNAPSHOTS_DAYS_COUNT=${DELETE_OLD_SNAPSHOTS_DAYS_COUNT}

  environment:

    name: dev/curator

  only:
@@ -86,8 +86,8 @@ deploy-curator-supporting-branch-production: 
      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_AUTH=${ELASTICSEARCH_AUTH}

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

      DELETE_OLD_SNAPSHOTS_DISABLE=${DELETE_OLD_SNAPSHOTS_DISABLE} LOG_INDEX_PREFIX=${LOG_INDEX_PREFIX}

      DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT} SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY}

      DELETE_OLD_SNAPSHOTS_DAYS_COUNT=${DELETE_OLD_SNAPSHOTS_DAYS_COUNT}

      DELETE_OLD_LOGS_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT}

      SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY} DELETE_OLD_SNAPSHOTS_DAYS_COUNT=${DELETE_OLD_SNAPSHOTS_DAYS_COUNT}

  environment:

    name: pro/curator

  only:
@@ -114,8 +114,8 @@ deploy-curator-stable-branch-production: 
      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_AUTH=${ELASTICSEARCH_AUTH}

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

      DELETE_OLD_SNAPSHOTS_DISABLE=${DELETE_OLD_SNAPSHOTS_DISABLE} LOG_INDEX_PREFIX=${LOG_INDEX_PREFIX}

      DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT} SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY}

      DELETE_OLD_SNAPSHOTS_DAYS_COUNT=${DELETE_OLD_SNAPSHOTS_DAYS_COUNT}

      DELETE_OLD_LOGS_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT}

      SNAPSHOT_REPOSITORY=${SNAPSHOT_REPOSITORY} DELETE_OLD_SNAPSHOTS_DAYS_COUNT=${DELETE_OLD_SNAPSHOTS_DAYS_COUNT}

  environment:

    name: pro/curator

  only:

deploy/.env

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ ELASTICSEARCH_AUTH=user:pass 
ELASTICSEARCH_PORT=9200

CURATOR_TIMEOUT=60

LOG_INDEX_PREFIX=fluentd-

DELETE_OLD_LOGS_DAYS_COUNT=30

DELETE_OLD_LOGS_TIMESTRING=%Y%m

DELETE_OLD_LOGS_DAYS_COUNT=60

SNAPSHOT_REPOSITORY=s3-backup

DELETE_OLD_SNAPSHOTS_DAYS_COUNT=90

SNAPSHOT_RESTORE_NAME=

deploy/config/actions.yml

+4 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ actions: 
  1:

    action: delete_indices

    description: >-

      Delete indices older than 30 (by default) days (based on index name), for 'fluentd-' prefixed indices. Ignore

      Delete indices older than 60 (by default) days (based on index name), for 'fluentd-' prefixed indices. Ignore

      the error if the filter does not result in an actionable list of indices (ignore_empty_list) and exit cleanly.

    options:

      ignore_empty_list: True
@@ -16,9 +16,9 @@ actions: 
    - filtertype: age

      source: name

      direction: older

      timestring: '%Y%m%d'

      timestring: ${DELETE_OLD_LOGS_TIMESTRING:%Y%m}

      unit: days

      unit_count: ${DELETE_OLD_LOGS_DAYS_COUNT:30}

      unit_count: ${DELETE_OLD_LOGS_DAYS_COUNT:60}



  2:

    action: snapshot
@@ -70,6 +70,7 @@ actions: 
      indices:

      - ${SNAPSHOT_RESTORE_INDICES}

      include_aliases: ${SNAPSHOT_RESTORE_INCLUDE_ALIASES:True}

      ignore_unavailable: True

      wait_interval: 30

      disable_action: ${RESTORE_SNAPSHOT_DISABLE:True}

    filters:

deploy/docker-compose.curator.tmpl.yml

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ version: '3.5' 


services:

  curator:

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

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

    command: /.curator/actions.yml

    environment:

      - ELASTICSEARCH_URL
@@ -10,6 +10,7 @@ services: 
      - ELASTICSEARCH_PORT

      - CURATOR_TIMEOUT

      - LOG_INDEX_PREFIX

      - DELETE_OLD_LOGS_TIMESTRING

      - DELETE_OLD_LOGS_DAYS_COUNT

      - SNAPSHOT_REPOSITORY

      - DELETE_OLD_SNAPSHOTS_DAYS_COUNT