Add latest changes from gitlab-org/gitlab@master

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