Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Feb 11, 2025
+73 −8
Merged

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

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
18d4de5
[helm]: fix system integration to utilise hostfs mount
pkoutsovasilis Jan 31, 2025
cb2e6bf
Merge branch 'main' into helm/hostfs_system_integration
pkoutsovasilis Feb 3, 2025
f77cce1
Merge branch 'main' into helm/hostfs_system_integration
jlind23 Feb 4, 2025
af4b7f5
Merge branch 'main' into helm/hostfs_system_integration
pkoutsovasilis Feb 5, 2025
0840875
[kustomize]: fix system integration to utilise hostfs mount
pkoutsovasilis Feb 5, 2025
3487400
Merge branch 'main' into helm/hostfs_system_integration
pkoutsovasilis Feb 5, 2025
ca3e689
Merge branch 'main' into helm/hostfs_system_integration
pkoutsovasilis Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
@@ -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:
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
@@ -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
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
@@ -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
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
@@ -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
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
@@ -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
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
@@ -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
9 changes: 8 additions & 1 deletion deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
View file
Original file line number Diff line number Diff line change
@@ -443,19 +443,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)($|/)
@@ -465,6 +468,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)($|/)
@@ -481,6 +485,7 @@ data:
period: 10s
metricsets:
- memory
system.hostfs: '/hostfs'
- data_stream:
dataset: system.network
type: metrics
@@ -501,19 +506,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
9 changes: 8 additions & 1 deletion deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml
View file
Original file line number Diff line number Diff line change
@@ -443,19 +443,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)($|/)
@@ -465,6 +468,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)($|/)
@@ -481,6 +485,7 @@ data:
period: 10s
metricsets:
- memory
system.hostfs: '/hostfs'
- data_stream:
dataset: system.network
type: metrics
@@ -501,19 +506,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
9 changes: 8 additions & 1 deletion ...kubernetes/elastic-agent-standalone/elastic-agent-standalone-ksm-daemonset-configmap.yaml
View file
Original file line number Diff line number Diff line change
@@ -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