From eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 17 Feb 2020 18:09:00 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 vendor/elastic_stack/values.yaml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'vendor')

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
-- 
cgit v1.2.3