Skip to content

Commit

Permalink
Fix errors filesystem metrics scraping errors (#1550)
Browse files Browse the repository at this point in the history
By excluding mount point that are not accessible by the collector container
  • Loading branch information
dmitryax authored Nov 22, 2024
1 parent b2cd8d6 commit 686a9b5
Show file tree
Hide file tree
Showing 63 changed files with 192 additions and 214 deletions.
8 changes: 8 additions & 0 deletions .chloggen/fix-scraping-error.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
component: agent
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Exclude scraping filesystem metrics from mounts that are not accessible from inside the container to avoid scraping errors.
# One or more tracking issues related to the change
issues: [1550]
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: f372080340f1c4a43d2ea949e57f3f572222517151cfdb181cadb0fec9c981e0
checksum/config: 1e1d35fe52ea86d3b1c5f6912dfdccb373dbeb11d8079785df4d083cdca125fc
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -156,11 +156,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: eb5439c4378c87f81c6301f0fffe0cf4a4ac4b2eb4930448b0f80e7404a00e62
checksum/config: 6fcdb388a1a73d2963e183f75d50e4b986dbbcc7e8b6fc98340a0fd753e61877
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -156,11 +156,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 8754015e8d74212dc9065dbc2341f7f9a71538dfeda6ed0e92bb20f81f12d944
checksum/config: 9fda779728e6dbd2c7fe3b354c87648c0b1db713d9868a5d5042d28a3da1d2f1
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -115,11 +115,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
6 changes: 5 additions & 1 deletion examples/add-sampler/rendered_manifests/configmap-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
7 changes: 1 addition & 6 deletions examples/add-sampler/rendered_manifests/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 870d629179695f9f97f107d3d8f25580518086a64a93aa2b5915f2050a24c042
checksum/config: 13a7820b7cb33de19301208985377a91d7c098fbc57c54ee235c4bd4bf1e258f
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -115,11 +115,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
7 changes: 1 addition & 6 deletions examples/autodetect-istio/rendered_manifests/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 11babc22b246e7f4ad711899f3b4810dacd759b2f2ed9b9e6acb611bd690559c
checksum/config: 66b21e5dabb057fd110eebd50a90c0e8e58156b6b26cc4c606645bc772ba91e7
kubectl.kubernetes.io/default-container: otel-collector
sidecar.istio.io/inject: "false"
spec:
Expand Down Expand Up @@ -157,11 +157,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 5be83086b56656af2fd9fed12e45aae07221bcf48d3368b4f8d5f0bb58b9c730
checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -115,11 +115,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: e5499dcf6876149aa0da5a0d584e92208b1f87f90d41e9f617b362860df16990
checksum/config: 314eed3acbc1c301a3749a2c53587f8bf911c91ecad613872f01ad5b2012dca7
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -115,11 +115,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 28a7cc161df7a967b46b54f55c2a18ca10dd518e0b2f26a922558860d7ef43f0
checksum/config: 8613bc77558deeb8d0540993de3b26e528120ce7e6adcfb0f644b33bf9b007fa
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -115,11 +115,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
7 changes: 1 addition & 6 deletions examples/crio-logging/rendered_manifests/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 5be83086b56656af2fd9fed12e45aae07221bcf48d3368b4f8d5f0bb58b9c730
checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -115,11 +115,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
6 changes: 5 additions & 1 deletion examples/default/rendered_manifests/configmap-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
7 changes: 1 addition & 6 deletions examples/default/rendered_manifests/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 5be83086b56656af2fd9fed12e45aae07221bcf48d3368b4f8d5f0bb58b9c730
checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -115,11 +115,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_observability_access_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 23c46f03a14894bfb7e579b88d6e63893ed91617132f45ce932031c5774066d9
checksum/config: ef6f7965727ca30cdf440838ca6301d52c9ca24c4d1f1d41a6d2490b64d2f084
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down Expand Up @@ -156,11 +156,6 @@ spec:
secretKeyRef:
name: default-splunk-otel-collector
key: splunk_platform_hec_token
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
# is resolved fall back to previous gopsutil mountinfo path:
# https://github.com/shirou/gopsutil/issues/1271
- name: HOST_PROC_MOUNTINFO
value: /proc/self/mountinfo

readinessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ data:
scrapers:
cpu: null
disk: null
filesystem: null
filesystem:
exclude_mount_points:
match_type: regexp
mount_points:
- /var/.*
load: null
memory: null
network: null
Expand Down
Loading

0 comments on commit 686a9b5

Please sign in to comment.