diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 537091fb9..03dece255 100644 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v7.1.0 description: OpenStack-Helm ElasticSearch name: elasticsearch -version: 0.1.7 +version: 0.1.8 home: https://www.elastic.co/ sources: - https://github.com/elastic/elasticsearch diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index d438c748f..b64d01603 100644 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -966,12 +966,12 @@ storage: manifests: - configmap_bin_curator: true + configmap_bin_curator: false configmap_bin_elasticsearch: true - configmap_etc_curator: true + configmap_etc_curator: false configmap_etc_elasticsearch: true configmap_etc_templates: true - cron_curator: true + cron_curator: false cron_verify_repositories: true deployment_client: true ingress: true diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml index 28dda86e2..8b46cb509 100644 --- a/releasenotes/notes/elasticsearch.yaml +++ b/releasenotes/notes/elasticsearch.yaml @@ -8,4 +8,5 @@ elasticsearch: - 0.1.5 Make templates job more generic - 0.1.6 Fix elasticsearch-master rendering error - 0.1.7 Pin Java options to specific versions + - 0.1.8 Disable Curator in Gate & Chart Defaults ... diff --git a/tools/deployment/osh-infra-logging/050-elasticsearch.sh b/tools/deployment/osh-infra-logging/050-elasticsearch.sh index 2bbc6cf90..e8e6452d2 100755 --- a/tools/deployment/osh-infra-logging/050-elasticsearch.sh +++ b/tools/deployment/osh-infra-logging/050-elasticsearch.sh @@ -22,8 +22,6 @@ tee /tmp/elasticsearch.yaml << EOF jobs: verify_repositories: cron: "*/3 * * * *" - curator: - cron: "*/10 * * * *" monitoring: prometheus: enabled: true @@ -36,71 +34,6 @@ conf: elasticsearch: snapshots: enabled: true - curator: - action_file: - actions: - 1: - action: delete_indices - description: >- - "Delete indices older than 365 days" - options: - timeout_override: - continue_if_exception: False - ignore_empty_list: True - disable_action: False - filters: - - filtertype: pattern - kind: prefix - value: logstash- - - filtertype: age - source: name - direction: older - timestring: '%Y.%m.%d' - unit: days - unit_count: 365 - 2: - action: snapshot - description: >- - "Snapshot all indices older than 365 days" - options: - repository: logstash_snapshots - name: "snapshot-%Y-.%m.%d" - wait_for_completion: True - max_wait: 36000 - wait_interval: 30 - ignore_empty_list: True - continue_if_exception: False - disable_action: False - filters: - - filtertype: age - source: name - direction: older - timestring: '%Y.%m.%d' - unit: days - unit_count: 365 - 3: - action: delete_snapshots - description: >- - "Delete index snapshots older than 365 days" - options: - repository: logstash_snapshots - timeout_override: 1200 - retry_interval: 120 - retry_count: 5 - ignore_empty_list: True - continue_if_exception: False - disable_action: False - filters: - - filtertype: pattern - kind: prefix - value: snapshot- - - filtertype: age - source: name - direction: older - timestring: '%Y.%m.%d' - unit: days - unit_count: 365 - EOF : ${OSH_INFRA_EXTRA_HELM_ARGS_ELASTICSEARCH:="$(./tools/deployment/common/get-values-overrides.sh elasticsearch)"}