Commit 071b655e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Usa el mes como unidad de borrado de logs

See merge request redmic-project/elastic/curator!11
parents 85ccbcc2 b81b88e4

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ deploy-curator-supporting-branch-develop: 
      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_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT}

      DELETE_OLD_LOGS_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_MONTHS_COUNT=${DELETE_OLD_LOGS_MONTHS_COUNT}

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

  environment:

    name: dev/curator
@@ -59,7 +59,7 @@ deploy-curator-stable-branch-develop: 
      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_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT}

      DELETE_OLD_LOGS_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_MONTHS_COUNT=${DELETE_OLD_LOGS_MONTHS_COUNT}

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

  environment:

    name: dev/curator
@@ -86,7 +86,7 @@ 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_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT}

      DELETE_OLD_LOGS_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_MONTHS_COUNT=${DELETE_OLD_LOGS_MONTHS_COUNT}

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

  environment:

    name: pro/curator
@@ -114,7 +114,7 @@ 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_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_DAYS_COUNT=${DELETE_OLD_LOGS_DAYS_COUNT}

      DELETE_OLD_LOGS_TIMESTRING=${DELETE_OLD_LOGS_TIMESTRING} DELETE_OLD_LOGS_MONTHS_COUNT=${DELETE_OLD_LOGS_MONTHS_COUNT}

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

  environment:

    name: pro/curator

deploy/.env

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ ELASTICSEARCH_PORT=9200 
CURATOR_TIMEOUT=60

LOG_INDEX_PREFIX=fluentd-

DELETE_OLD_LOGS_TIMESTRING=%Y%m

DELETE_OLD_LOGS_DAYS_COUNT=60

DELETE_OLD_LOGS_MONTHS_COUNT=2

SNAPSHOT_REPOSITORY=s3-backup

DELETE_OLD_SNAPSHOTS_DAYS_COUNT=90

SNAPSHOT_RESTORE_NAME=

deploy/config/actions.yml

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

    action: delete_indices

    description: >-

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

      Delete indices older than 2 (by default) months (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
@@ -17,8 +17,8 @@ actions: 
      source: name

      direction: older

      timestring: ${DELETE_OLD_LOGS_TIMESTRING:%Y%m}

      unit: days

      unit_count: ${DELETE_OLD_LOGS_DAYS_COUNT:60}

      unit: months

      unit_count: ${DELETE_OLD_LOGS_MONTHS_COUNT:2}



  2:

    action: snapshot

deploy/docker-compose.curator.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ services: 
      - CURATOR_TIMEOUT

      - LOG_INDEX_PREFIX

      - DELETE_OLD_LOGS_TIMESTRING

      - DELETE_OLD_LOGS_DAYS_COUNT

      - DELETE_OLD_LOGS_MONTHS_COUNT

      - SNAPSHOT_REPOSITORY

      - DELETE_OLD_SNAPSHOTS_DAYS_COUNT

      - DELETE_OLD_LOGS_DISABLE

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ services: 
      - ELASTICSEARCH_PORT

      - CURATOR_TIMEOUT

      - LOG_INDEX_PREFIX

      - DELETE_OLD_LOGS_DAYS_COUNT

      - DELETE_OLD_LOGS_MONTHS_COUNT

      - SNAPSHOT_REPOSITORY

      - DELETE_OLD_SNAPSHOTS_DAYS_COUNT

      - DELETE_OLD_LOGS_DISABLE