diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 18:21:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 18:21:10 +0300 |
commit | e33f87ac0fabaab468ce4b457996cc0f1b1bb648 (patch) | |
tree | 8bf0de72a9acac014cfdaddab7d463b208294af2 /vendor | |
parent | 5baf990db20a75078684702782c24399ef9eb0fa (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/elastic_stack/values.yaml | 13 | ||||
-rw-r--r-- | vendor/project_templates/sse_middleman.tar.gz | bin | 0 -> 7099 bytes |
2 files changed, 12 insertions, 1 deletions
diff --git a/vendor/elastic_stack/values.yaml b/vendor/elastic_stack/values.yaml index 48950ed8bbb..ec05f163cf0 100644 --- a/vendor/elastic_stack/values.yaml +++ b/vendor/elastic_stack/values.yaml @@ -23,7 +23,7 @@ filebeat: output.elasticsearch: enabled: true hosts: ["http://elastic-stack-elasticsearch-client:9200"] - filebeat.prospectors: + filebeat.inputs: - type: log enabled: true paths: @@ -86,6 +86,17 @@ elasticsearch-curator: timestring: '%Y.%m.%d' unit: days unit_count: 30 + 2: + action: delete_indices + description: >- + Indices created by filebeat 6.7.0 are incompatible with filebeat 7, + so they will be deleted. + options: + ignore_empty_list: True + filters: + - filtertype: pattern + kind: prefix + value: filebeat-6.7.0- elasticsearch-exporter: enabled: false diff --git a/vendor/project_templates/sse_middleman.tar.gz b/vendor/project_templates/sse_middleman.tar.gz Binary files differnew file mode 100644 index 00000000000..62126e8f80d --- /dev/null +++ b/vendor/project_templates/sse_middleman.tar.gz |