fix: kubernetes configuration

filebeat-docker.yml

@@ -1,7 +1,7 @@
-filebeat.config:
-  modules:
-    path: ${path.config}/modules.d/*.yml
-    reload.enabled: false
+#filebeat.config:
+#  modules:
+#    path: ${path.config}/modules.d/*.yml
+#    reload.enabled: false
 
 filebeat.autodiscover:
   providers:

filebeat-kubernetes.yml

@@ -1,35 +1,34 @@
-filebeat.config:
-  modules:
-    path: ${path.config}/modules.d/*.yml
-    reload.enabled: false
+#filebeat.config:
+#  modules:
+#    path: ${path.config}/modules.d/*.yml
+#    reload.enabled: false
 
 filebeat.autodiscover:
   providers:
     - type: kubernetes
       node: '${NODE_NAME}'
       hints.enabled: true
+      #templates:
+      #  - config:
+      #    - type: container
+      #      paths:
+      #        - /var/log/containers/*-${data.kubernetes.container.id}.log
       # kubernetes pod annotation example
-      #annotations:
-      #  co.elastic.logs.json-logging/json.keys_under_root: "true"
-      #  co.elastic.logs.json-logging/json.add_error_key: "true"
-      #  co.elastic.logs.json-logging/json.message_key: "message"
-      #
+      # annotations:
+      #   co.elastic.logs.json-logging/json.keys_under_root: "true"
+      #   co.elastic.logs.json-logging/json.add_error_key: "true"
+      #   co.elastic.logs.json-logging/json.message_key: "message"
       hints.default_config:
         type: container
         paths:
-          - /var/log/containers/*${data.kubernetes.container.id}.log
+          - /var/log/containers/*-${data.kubernetes.container.id}.log
 
 processors:
   - add_cloud_metadata: ~
   - add_locale:
       format: offset
-  - add_docker_metadata:
-      host: "unix:///var/run/docker.sock"
+  - add_kubernetes_metadata:
   - add_host_metadata: ~
-  - decode_json_fields:
-      fields: ["message"]
-      target: "json"
-      overwrite_keys: true
 
 setup:
   kibana:
@@ -51,7 +50,7 @@ output.elasticsearch:
   ssl:
     verification_mode: none
   indices:
-    - index: "filebeat-%{[agent.version]}-%{[container.name]:common}-%{+yyyy.MM.dd}"
+    - index: "filebeat-%{[agent.version]}-%{[kubernetes.container.name]:common}-%{+yyyy.MM.dd}"
 
 
 #logging.json: true