summaryrefslogtreecommitdiff
path: root/vendor/elastic_stack
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-30 15:08:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-30 15:08:48 +0000
commit340f15b402eec795fca0e0f29709baef0ecf14a7 (patch)
tree6a7eac5d394f4002b9e5b0c9da12bc12e59ed59c /vendor/elastic_stack
parent1e254d9f5a46a85c9bb6f24da8265a30fd388db4 (diff)
downloadgitlab-ce-340f15b402eec795fca0e0f29709baef0ecf14a7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor/elastic_stack')
-rw-r--r--vendor/elastic_stack/values.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/vendor/elastic_stack/values.yaml b/vendor/elastic_stack/values.yaml
index 21352dd35e2..a6c9fdd39a4 100644
--- a/vendor/elastic_stack/values.yaml
+++ b/vendor/elastic_stack/values.yaml
@@ -14,8 +14,12 @@ filebeat:
filebeatConfig:
filebeat.yml: |
output.file.enabled: false
+ setup.ilm.enabled: false
+ setup.template.name: 'filebeat'
+ setup.template.pattern: 'filebeat-*'
output.elasticsearch:
hosts: ["http://elastic-stack-elasticsearch-master:9200"]
+ index: "filebeat-%{[agent.version]}-%{+yyyy.MM.dd}"
filebeat.inputs:
- type: container
paths: