Commit 9a3e85cc authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza patrón de índices de log y duración 

Permite definir el patrón de nombre de los índices desde fuera.
Pasa de especificar año, mes y día, a solo año y mes.
parent 58b54d71

.gitlab-ci.yml

+8 −8
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 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_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:
@@ -59,8 +59,8 @@ 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_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

+3 −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

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