1 files changed, 12 insertions, 33 deletions
diff --git a/tools/eck-operator/templates/beat.yaml b/tools/eck-operator/templates/beat.yaml
index 31c70c0..0b9edd4 100644
--- a/tools/eck-operator/templates/beat.yaml
+++ b/tools/eck-operator/templates/beat.yaml
@@ -2,56 +2,32 @@ apiVersion: beat.k8s.elastic.co/v1beta1
 kind: Beat
 metadata:
   name: log-storage
-  namespace: monitoring
 spec:
   type: filebeat
   version: 8.14.1
   elasticsearchRef:
     name: log-storage
   config:
-    filebeat:
-      autodiscover:
-        providers:
-        - type: kubernetes
-          node: ${NODE_NAME}
-          hints:
-            enabled: true
-            default_config:
-              type: container
-              paths:
-              - /var/log/containers/*${data.kubernetes.container.id}.log
-    processors:
-    - add_fields:
-        target: event
-        fields:
-          dataset: log-storage
-    - add_cloud_metadata: {}
-    - add_host_metadata: {}
+    filebeat.inputs:
+    - type: container
+      paths:
+      - /var/log/containers/*.log
   daemonSet:
     podTemplate:
       spec:
-        tolerations:
-        - key: node-role.kubernetes.io/master
-          effect: NoSchedule
-        terminationGracePeriodSeconds: 30
         dnsPolicy: ClusterFirstWithHostNet
-        hostNetwork: true # Allows to provide richer host metadata
+        hostNetwork: true
+        securityContext:
+          runAsUser: 0
         containers:
         - name: filebeat
-          securityContext:
-            runAsUser: 0
-            # If using Red Hat OpenShift uncomment this:
-            #privileged: true
           volumeMounts:
           - name: varlogcontainers
             mountPath: /var/log/containers
           - name: varlogpods
             mountPath: /var/log/pods
-          env:
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
+          - name: varlibdockercontainers
+            mountPath: /var/lib/docker/containers
         volumes:
         - name: varlogcontainers
           hostPath:
@@ -59,3 +35,6 @@ spec:
         - name: varlogpods
           hostPath:
             path: /var/log/pods
+        - name: varlibdockercontainers
+          hostPath:
+            path: /var/lib/docker/containers