Skip to content

Commit

Permalink
[k8s] Fix System Integration to utilise hostfs mounts (#6666)
Browse files Browse the repository at this point in the history 
* [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>
  • Loading branch information
@pkoutsovasilis @jlind23
pkoutsovasilis and jlind23 authored Feb 11, 2025
1 parent 8a878fc commit 45b0cf4
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 8 deletions.
10 changes: 9 additions & 1 deletion deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -128,6 +132,7 @@ stringData:
metricsets:
- memory
period: 10s
system.hostfs: /hostfs
- data_stream:
dataset: system.network
type: metrics
Expand All @@ -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
Expand Down Expand Up @@ -295,7 +303,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: 535875b1a8f244fc529158f3467dec1983ca2ef19d365518da249fd46e22d0ef
checksum/config: dc3e48e999091f8db08e8ce2c2de127239731b26d598b6399ad93ef3636a3245
spec:
automountServiceAccountToken: true
containers:
Expand Down
8 changes: 8 additions & 0 deletions deploy/helm/elastic-agent/templates/integrations/_system/_system_metrics.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)($|/)
Expand All @@ -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)($|/)
Expand All @@ -60,6 +64,7 @@
period: 10s
metricsets:
- memory
system.hostfs: '/hostfs'
- data_stream:
dataset: system.network
type: metrics
Expand All @@ -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
Expand Down
9 changes: 8 additions & 1 deletion ...e/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset-configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)($|/)
Expand All @@ -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)($|/)
Expand All @@ -484,6 +488,7 @@ data:
period: 10s
metricsets:
- memory
system.hostfs: '/hostfs'
- data_stream:
dataset: system.network
type: metrics
Expand All @@ -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
Expand Down
9 changes: 8 additions & 1 deletion ...fault/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)($|/)
Expand All @@ -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)($|/)
Expand All @@ -249,6 +253,7 @@ data:
period: 10s
metricsets:
- memory
system.hostfs: '/hostfs'
- data_stream:
dataset: system.network
type: metrics
Expand All @@ -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
Expand Down
9 changes: 8 additions & 1 deletion ...rding/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)($|/)
Expand All @@ -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)($|/)
Expand All @@ -249,6 +253,7 @@ data:
period: 10s
metricsets:
- memory
system.hostfs: '/hostfs'
- data_stream:
dataset: system.network
type: metrics
Expand All @@ -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
Expand Down
9 changes: 8 additions & 1 deletion ...mize/ksm-hints/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)($|/)
Expand All @@ -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)($|/)
Expand All @@ -453,6 +457,7 @@ data:
period: 10s
metricsets:
- memory
system.hostfs: '/hostfs'
- data_stream:
dataset: system.network
type: metrics
Expand All @@ -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
Expand Down
Loading

0 comments on commit 45b0cf4

Please sign in to comment.