summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-16 18:08:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-16 18:08:46 +0000
commitaa0f0e992153e84e1cdec8a1c7310d5eb93a9f8f (patch)
tree4a662bc77fb43e1d1deec78cc7a95d911c0da1c5 /vendor
parentd47f9d2304dbc3a23bba7fe7a5cd07218eeb41cd (diff)
downloadgitlab-ce-aa0f0e992153e84e1cdec8a1c7310d5eb93a9f8f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r--vendor/elastic_stack/values.yaml30
1 files changed, 29 insertions, 1 deletions
diff --git a/vendor/elastic_stack/values.yaml b/vendor/elastic_stack/values.yaml
index 2aa254eaa4a..ccbff1ab38d 100644
--- a/vendor/elastic_stack/values.yaml
+++ b/vendor/elastic_stack/values.yaml
@@ -34,7 +34,35 @@ nginx-ldapauth-proxy:
enabled: false
elasticsearch-curator:
- enabled: false
+ enabled: true
+ configMaps:
+ config_yml: |-
+ ---
+ client:
+ hosts:
+ - elastic-stack-elasticsearch-client
+ port: 9200
+ action_file_yml: |-
+ ---
+ actions:
+ 1:
+ action: delete_indices
+ description: >-
+ Delete indices older than 15 days (based on index name), for filebeat-
+ 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
+ filters:
+ - filtertype: pattern
+ kind: prefix
+ value: filebeat-
+ - filtertype: age
+ source: name
+ direction: older
+ timestring: '%Y.%m.%d'
+ unit: days
+ unit_count: 15
elasticsearch-exporter:
enabled: false