summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 18:09:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 18:09:00 +0000
commiteb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (patch)
treed572a6d931152ae0dd10427237f5811893438552 /vendor
parentb304a72312465ed4c0a568ee6a6ea5e97f705c9b (diff)
downloadgitlab-ce-eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r--vendor/elastic_stack/values.yaml23
1 files changed, 23 insertions, 0 deletions
diff --git a/vendor/elastic_stack/values.yaml b/vendor/elastic_stack/values.yaml
index 9355a9b6b81..48950ed8bbb 100644
--- a/vendor/elastic_stack/values.yaml
+++ b/vendor/elastic_stack/values.yaml
@@ -23,6 +23,29 @@ filebeat:
output.elasticsearch:
enabled: true
hosts: ["http://elastic-stack-elasticsearch-client:9200"]
+ filebeat.prospectors:
+ - type: log
+ enabled: true
+ paths:
+ - /var/log/*.log
+ - /var/log/messages
+ - /var/log/syslog
+ - type: docker
+ containers.ids:
+ - "*"
+ json.keys_under_root: true
+ json.ignore_decoding_error: true
+ processors:
+ - add_kubernetes_metadata:
+ - drop_event:
+ when:
+ equals:
+ kubernetes.container.name: "filebeat"
+ - decode_json_fields:
+ fields: ["message"]
+ when:
+ equals:
+ kubernetes.container.name: "modsecurity-log"
fluentd:
enabled: false