Update kubernetes templates for elastic-agent [templates.d] (#1231)

elastic · Sep 19, 2022 · 5a0ba4d · 5a0ba4d
1 parent 270295f
commit 5a0ba4d
Show file tree

Hide file tree

Showing 17 changed files with 300 additions and 437 deletions.
diff --git a/deploy/kubernetes/elastic-agent-standalone/templates.d/activemq.yml b/deploy/kubernetes/elastic-agent-standalone/templates.d/activemq.yml
@@ -1,4 +1,49 @@
 inputs:
+    - name: filestream-activemq
+      type: filestream
+      use_output: default
+      streams:
+        - condition: ${kubernetes.hints.activemq.audit.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
+          data_stream:
+            dataset: activemq.audit
+            type: logs
+          exclude_files:
+            - .gz$
+          parsers:
+            - container:
+                format: auto
+                stream: ${kubernetes.hints.activemq.audit.stream|'all'}
+          paths:
+            - /var/log/containers/*${kubernetes.hints.container_id}.log
+          prospector:
+            scanner:
+                symlinks: true
+          tags:
+            - forwarded
+            - activemq-audit
+        - condition: ${kubernetes.hints.activemq.log.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
+          data_stream:
+            dataset: activemq.log
+            type: logs
+          exclude_files:
+            - .gz$
+          multiline:
+            match: after
+            negate: true
+            pattern: '^\d{4}-\d{2}-\d{2} '
+          parsers:
+            - container:
+                format: auto
+                stream: ${kubernetes.hints.activemq.log.stream|'all'}
+          paths:
+            - /var/log/containers/*${kubernetes.hints.container_id}.log
+          prospector:
+            scanner:
+                symlinks: true
+          tags:
+            - forwarded
+            - activemq-log
+      data_stream.namespace: default
     - name: activemq/metrics-activemq
       type: activemq/metrics
       use_output: default
@@ -49,48 +94,3 @@ inputs:
             - activemq-topic
           username: ${kubernetes.hints.activemq.topic.username|'admin'}
       data_stream.namespace: default
-    - name: filestream-activemq
-      type: filestream
-      use_output: default
-      streams:
-        - condition: ${kubernetes.hints.activemq.audit.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
-          data_stream:
-            dataset: activemq.audit
-            type: logs
-          exclude_files:
-            - .gz$
-          parsers:
-            - container:
-                format: auto
-                stream: ${kubernetes.hints.activemq.audit.stream|'all'}
-          paths:
-            - /var/log/containers/*${kubernetes.hints.container_id}.log
-          prospector:
-            scanner:
-                symlinks: true
-          tags:
-            - forwarded
-            - activemq-audit
-        - condition: ${kubernetes.hints.activemq.log.enabled} == true or ${kubernetes.hints.activemq.enabled} == true
-          data_stream:
-            dataset: activemq.log
-            type: logs
-          exclude_files:
-            - .gz$
-          multiline:
-            match: after
-            negate: true
-            pattern: '^\d{4}-\d{2}-\d{2} '
-          parsers:
-            - container:
-                format: auto
-                stream: ${kubernetes.hints.activemq.log.stream|'all'}
-          paths:
-            - /var/log/containers/*${kubernetes.hints.container_id}.log
-          prospector:
-            scanner:
-                symlinks: true
-          tags:
-            - forwarded
-            - activemq-log
-      data_stream.namespace: default
diff --git a/deploy/kubernetes/elastic-agent-standalone/templates.d/apache.yml b/deploy/kubernetes/elastic-agent-standalone/templates.d/apache.yml
@@ -1,19 +1,4 @@
 inputs:
-    - name: apache/metrics-apache
-      type: apache/metrics
-      use_output: default
-      streams:
-        - condition: ${kubernetes.hints.apache.status.enabled} == true or ${kubernetes.hints.apache.enabled} == true
-          data_stream:
-            dataset: apache.status
-            type: metrics
-          hosts:
-            - ${kubernetes.hints.apache.status.host|'http://127.0.0.1'}
-          metricsets:
-            - status
-          period: ${kubernetes.hints.apache.status.period|'30s'}
-          server_status_path: /server-status
-      data_stream.namespace: default
     - name: filestream-apache
       type: filestream
       use_output: default
@@ -132,3 +117,18 @@ inputs:
             - forwarded
             - apache-error
       data_stream.namespace: default
+    - name: apache/metrics-apache
+      type: apache/metrics
+      use_output: default
+      streams:
+        - condition: ${kubernetes.hints.apache.status.enabled} == true or ${kubernetes.hints.apache.enabled} == true
+          data_stream:
+            dataset: apache.status
+            type: metrics
+          hosts:
+            - ${kubernetes.hints.apache.status.host|'http://127.0.0.1'}
+          metricsets:
+            - status
+          period: ${kubernetes.hints.apache.status.period|'30s'}
+          server_status_path: /server-status
+      data_stream.namespace: default
diff --git a/deploy/kubernetes/elastic-agent-standalone/templates.d/cassandra.yml b/deploy/kubernetes/elastic-agent-standalone/templates.d/cassandra.yml
@@ -1,4 +1,31 @@
 inputs:
+    - name: filestream-cassandra
+      type: filestream
+      use_output: default
+      streams:
+        - condition: ${kubernetes.hints.cassandra.log.enabled} == true or ${kubernetes.hints.cassandra.enabled} == true
+          data_stream:
+            dataset: cassandra.log
+            type: logs
+          exclude_files:
+            - .gz$
+          multiline:
+            match: after
+            negate: true
+            pattern: ^([A-Z])
+          parsers:
+            - container:
+                format: auto
+                stream: ${kubernetes.hints.cassandra.log.stream|'all'}
+          paths:
+            - /var/log/containers/*${kubernetes.hints.container_id}.log
+          prospector:
+            scanner:
+                symlinks: true
+          tags:
+            - forwarded
+            - cassandra-systemlogs
+      data_stream.namespace: default
     - name: jolokia/metrics-cassandra
       type: jolokia/metrics
       use_output: default
@@ -298,30 +325,3 @@ inputs:
           period: ${kubernetes.hints.cassandra.metrics.period|'10s'}
           username: ${kubernetes.hints.cassandra.metrics.username|'admin'}
       data_stream.namespace: default
-    - name: filestream-cassandra
-      type: filestream
-      use_output: default
-      streams:
-        - condition: ${kubernetes.hints.cassandra.log.enabled} == true or ${kubernetes.hints.cassandra.enabled} == true
-          data_stream:
-            dataset: cassandra.log
-            type: logs
-          exclude_files:
-            - .gz$
-          multiline:
-            match: after
-            negate: true
-            pattern: ^([A-Z])
-          parsers:
-            - container:
-                format: auto
-                stream: ${kubernetes.hints.cassandra.log.stream|'all'}
-          paths:
-            - /var/log/containers/*${kubernetes.hints.container_id}.log
-          prospector:
-            scanner:
-                symlinks: true
-          tags:
-            - forwarded
-            - cassandra-systemlogs
-      data_stream.namespace: default
diff --git a/deploy/kubernetes/elastic-agent-standalone/templates.d/cloud_security_posture.yml b/deploy/kubernetes/elastic-agent-standalone/templates.d/cloud_security_posture.yml
diff --git a/deploy/kubernetes/elastic-agent-standalone/templates.d/cockroachdb.yml b/deploy/kubernetes/elastic-agent-standalone/templates.d/cockroachdb.yml
@@ -1,25 +1,4 @@
 inputs:
-    - name: filestream-cockroachdb
-      type: filestream
-      use_output: default
-      streams:
-        - condition: ${kubernetes.hints.cockroachdb.container_logs.enabled} == true
-          data_stream:
-            dataset: kubernetes.container_logs
-            type: logs
-          exclude_files: []
-          exclude_lines: []
-          parsers:
-            - container:
-                format: auto
-                stream: all
-          paths:
-            - /var/log/containers/*${kubernetes.hints.container_id}.log
-          prospector:
-            scanner:
-                symlinks: true
-          tags: []
-      data_stream.namespace: default
     - name: prometheus/metrics-cockroachdb
       type: prometheus/metrics
       use_output: default
@@ -42,3 +21,24 @@ inputs:
           use_types: true
           username: null
       data_stream.namespace: default
+    - name: filestream-cockroachdb
+      type: filestream
+      use_output: default
+      streams:
+        - condition: ${kubernetes.hints.cockroachdb.container_logs.enabled} == true
+          data_stream:
+            dataset: kubernetes.container_logs
+            type: logs
+          exclude_files: []
+          exclude_lines: []
+          parsers:
+            - container:
+                format: auto
+                stream: all
+          paths:
+            - /var/log/containers/*${kubernetes.hints.container_id}.log
+          prospector:
+            scanner:
+                symlinks: true
+          tags: []
+      data_stream.namespace: default