[k8s] Fix System Integration to utilise hostfs mounts (#6666) (#6811)

mergify[bot] · pkoutsovasilis · web-flow · commit 789e8433a58d · 2025-02-11T20:39:22.000Z
* [helm]: fix system integration to utilise hostfs mount * [kustomize]: fix system integration to utilise hostfs mount --------- Co-authored-by: Julien Lind <julien.lind@elastic.co> (cherry picked from commit 45b0cf4) Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
diff --git a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
@@ -90,13 +90,15 @@ stringData:
           metricsets:
           - cpu
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.diskio
             type: metrics
           diskio.include_devices: null
           metricsets:
           - diskio
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.filesystem
             type: metrics
@@ -106,6 +108,7 @@ stringData:
           processors:
           - drop_event.when.regexp:
               system.filesystem.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.fsstat
             type: metrics
@@ -115,6 +118,7 @@ stringData:
           processors:
           - drop_event.when.regexp:
               system.fsstat.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
+          system.hostfs: /hostfs
         - condition: ${host.platform} != 'windows'
           data_stream:
             dataset: system.load
@@ -128,6 +132,7 @@ stringData:
           metricsets:
           - memory
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.network
             type: metrics
@@ -148,18 +153,21 @@ stringData:
           process.include_top_n.by_memory: 5
           processes:
           - .*
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.process_summary
             type: metrics
           metricsets:
           - process_summary
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.socket_summary
             type: metrics
           metricsets:
           - socket_summary
           period: 10s
+          system.hostfs: /hostfs
         - data_stream:
             dataset: system.uptime
             type: metrics
@@ -295,7 +303,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 535875b1a8f244fc529158f3467dec1983ca2ef19d365518da249fd46e22d0ef
+        checksum/config: dc3e48e999091f8db08e8ce2c2de127239731b26d598b6399ad93ef3636a3245
     spec:
       automountServiceAccountToken: true
       containers:
diff --git a/deploy/helm/elastic-agent/templates/integrations/_system/_system_metrics.tpl b/deploy/helm/elastic-agent/templates/integrations/_system/_system_metrics.tpl
@@ -22,19 +22,22 @@
         - normalized_percentages
       metricsets:
         - cpu
+      system.hostfs: '/hostfs'
     - data_stream:
         dataset: system.diskio
         type: metrics
       period: 10s
       diskio.include_devices: null
       metricsets:
         - diskio
+      system.hostfs: '/hostfs'
     - data_stream:
         dataset: system.filesystem
         type: metrics
       period: 1m
       metricsets:
         - filesystem
+      system.hostfs: '/hostfs'
       processors:
         - drop_event.when.regexp:
             system.filesystem.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -44,6 +47,7 @@
       period: 1m
       metricsets:
         - fsstat
+      system.hostfs: '/hostfs'
       processors:
         - drop_event.when.regexp:
             system.fsstat.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -60,6 +64,7 @@
       period: 10s
       metricsets:
         - memory
+      system.hostfs: '/hostfs'
     - data_stream:
         dataset: system.network
         type: metrics
@@ -80,19 +85,22 @@
       process.include_cpu_ticks: false
       metricsets:
         - process
+      system.hostfs: '/hostfs'
       process.include_cpu_ticks: false
     - data_stream:
         dataset: system.process_summary
         type: metrics
       period: 10s
       metricsets:
         - process_summary
+      system.hostfs: '/hostfs'
     - data_stream:
         dataset: system.socket_summary
         type: metrics
       period: 10s
       metricsets:
         - socket_summary
+      system.hostfs: '/hostfs'
     - data_stream:
         type: metrics
         dataset: system.uptime
diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset-configmap.yaml
@@ -446,19 +446,22 @@ data:
               - normalized_percentages
             metricsets:
               - cpu
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.diskio
               type: metrics
             period: 10s
             diskio.include_devices: null
             metricsets:
               - diskio
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.filesystem
               type: metrics
             period: 1m
             metricsets:
               - filesystem
+            system.hostfs: '/hostfs'
             processors:
               - drop_event.when.regexp:
                   system.filesystem.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -468,6 +471,7 @@ data:
             period: 1m
             metricsets:
               - fsstat
+            system.hostfs: '/hostfs'
             processors:
               - drop_event.when.regexp:
                   system.fsstat.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -484,6 +488,7 @@ data:
             period: 10s
             metricsets:
               - memory
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.network
               type: metrics
@@ -504,19 +509,21 @@ data:
             process.include_cpu_ticks: false
             metricsets:
               - process
-            process.include_cpu_ticks: false
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.process_summary
               type: metrics
             period: 10s
             metricsets:
               - process_summary
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.socket_summary
               type: metrics
             period: 10s
             metricsets:
               - socket_summary
+            system.hostfs: '/hostfs'
           - data_stream:
               type: metrics
               dataset: system.uptime
diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml
@@ -211,19 +211,22 @@ data:
               - normalized_percentages
             metricsets:
               - cpu
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.diskio
               type: metrics
             period: 10s
             diskio.include_devices: null
             metricsets:
               - diskio
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.filesystem
               type: metrics
             period: 1m
             metricsets:
               - filesystem
+            system.hostfs: '/hostfs'
             processors:
               - drop_event.when.regexp:
                   system.filesystem.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -233,6 +236,7 @@ data:
             period: 1m
             metricsets:
               - fsstat
+            system.hostfs: '/hostfs'
             processors:
               - drop_event.when.regexp:
                   system.fsstat.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -249,6 +253,7 @@ data:
             period: 10s
             metricsets:
               - memory
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.network
               type: metrics
@@ -269,19 +274,21 @@ data:
             process.include_cpu_ticks: false
             metricsets:
               - process
-            process.include_cpu_ticks: false
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.process_summary
               type: metrics
             period: 10s
             metricsets:
               - process_summary
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.socket_summary
               type: metrics
             period: 10s
             metricsets:
               - socket_summary
+            system.hostfs: '/hostfs'
           - data_stream:
               type: metrics
               dataset: system.uptime
diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml
@@ -211,19 +211,22 @@ data:
               - normalized_percentages
             metricsets:
               - cpu
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.diskio
               type: metrics
             period: 10s
             diskio.include_devices: null
             metricsets:
               - diskio
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.filesystem
               type: metrics
             period: 1m
             metricsets:
               - filesystem
+            system.hostfs: '/hostfs'
             processors:
               - drop_event.when.regexp:
                   system.filesystem.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -233,6 +236,7 @@ data:
             period: 1m
             metricsets:
               - fsstat
+            system.hostfs: '/hostfs'
             processors:
               - drop_event.when.regexp:
                   system.fsstat.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -249,6 +253,7 @@ data:
             period: 10s
             metricsets:
               - memory
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.network
               type: metrics
@@ -269,19 +274,21 @@ data:
             process.include_cpu_ticks: false
             metricsets:
               - process
-            process.include_cpu_ticks: false
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.process_summary
               type: metrics
             period: 10s
             metricsets:
               - process_summary
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.socket_summary
               type: metrics
             period: 10s
             metricsets:
               - socket_summary
+            system.hostfs: '/hostfs'
           - data_stream:
               type: metrics
               dataset: system.uptime
diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml
@@ -415,19 +415,22 @@ data:
               - normalized_percentages
             metricsets:
               - cpu
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.diskio
               type: metrics
             period: 10s
             diskio.include_devices: null
             metricsets:
               - diskio
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.filesystem
               type: metrics
             period: 1m
             metricsets:
               - filesystem
+            system.hostfs: '/hostfs'
             processors:
               - drop_event.when.regexp:
                   system.filesystem.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -437,6 +440,7 @@ data:
             period: 1m
             metricsets:
               - fsstat
+            system.hostfs: '/hostfs'
             processors:
               - drop_event.when.regexp:
                   system.fsstat.mount_point: ^/(sys|cgroup|proc|dev|etc|host|lib|snap)($|/)
@@ -453,6 +457,7 @@ data:
             period: 10s
             metricsets:
               - memory
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.network
               type: metrics
@@ -473,19 +478,21 @@ data:
             process.include_cpu_ticks: false
             metricsets:
               - process
-            process.include_cpu_ticks: false
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.process_summary
               type: metrics
             period: 10s
             metricsets:
               - process_summary
+            system.hostfs: '/hostfs'
           - data_stream:
               dataset: system.socket_summary
               type: metrics
             period: 10s
             metricsets:
               - socket_summary
+            system.hostfs: '/hostfs'
           - data_stream:
               type: metrics
               dataset: system.uptime
diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml
diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-ksm-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-ksm-daemonset-configmap.yaml
