From 686a9b5c1c3e407e72f72cc3d71a7f74853772a7 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Fri, 22 Nov 2024 15:41:11 -0800 Subject: [PATCH] Fix errors filesystem metrics scraping errors (#1550) By excluding mount point that are not accessible by the collector container --- .chloggen/fix-scraping-error.yaml | 8 ++++++++ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../add-sampler/rendered_manifests/configmap-agent.yaml | 6 +++++- examples/add-sampler/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../autodetect-istio/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../crio-logging/rendered_manifests/configmap-agent.yaml | 6 +++++- examples/crio-logging/rendered_manifests/daemonset.yaml | 7 +------ examples/default/rendered_manifests/configmap-agent.yaml | 6 +++++- examples/default/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../discovery-mode/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../distribution-aks/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../distribution-eks/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../distribution-gke/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 6 +++++- examples/multi-metrics/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../only-metrics/rendered_manifests/configmap-agent.yaml | 6 +++++- examples/only-metrics/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../target-allocator/rendered_manifests/daemonset.yaml | 7 +------ .../use-proxy/rendered_manifests/configmap-agent.yaml | 6 +++++- examples/use-proxy/rendered_manifests/daemonset.yaml | 7 +------ .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 7 +------ .../templates/config/_otel-agent.tpl | 4 ++++ .../splunk-otel-collector/templates/daemonset.yaml | 9 --------- 63 files changed, 192 insertions(+), 214 deletions(-) create mode 100644 .chloggen/fix-scraping-error.yaml diff --git a/.chloggen/fix-scraping-error.yaml b/.chloggen/fix-scraping-error.yaml new file mode 100644 index 0000000000..79902d1ca6 --- /dev/null +++ b/.chloggen/fix-scraping-error.yaml @@ -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] diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml index f493f4bb58..1e8564de6c 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index 31d8ada77c..44a54db21f 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml index dd43cc4011..329c15f032 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index 2baf6c8056..a947d2274d 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml index 4ff34ce9db..25087fe4da 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index d523819b0b..4825fe4063 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml index d7bc970295..fe9b797afc 100644 --- a/examples/add-sampler/rendered_manifests/configmap-agent.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index 5a34b03a3e..78b245ccf4 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml index 185bd291e6..54f44b2c0e 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index a61af4a199..af573570c5 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -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: @@ -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: diff --git a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml index eb1907489c..ece40e3c75 100644 --- a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 7e3c346dff..6152ce0374 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml index 3349f00d35..933e144b4e 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index 8c187da7b3..1f338b8281 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml index 90a9710d7e..f4e7388daa 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index 3dfbd1e092..18aa889dba 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/crio-logging/rendered_manifests/configmap-agent.yaml b/examples/crio-logging/rendered_manifests/configmap-agent.yaml index eb1907489c..ece40e3c75 100644 --- a/examples/crio-logging/rendered_manifests/configmap-agent.yaml +++ b/examples/crio-logging/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 7e3c346dff..6152ce0374 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/default/rendered_manifests/configmap-agent.yaml b/examples/default/rendered_manifests/configmap-agent.yaml index eb1907489c..ece40e3c75 100644 --- a/examples/default/rendered_manifests/configmap-agent.yaml +++ b/examples/default/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 7e3c346dff..6152ce0374 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml index a9ee568e13..d2ad5532d7 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 6a4ca200e1..1a8e0d19b8 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -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 @@ -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: diff --git a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml index a05fea1bea..5aab1b7985 100644 --- a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml +++ b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index e0e6d0afff..9d561ee03c 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 80f514c40b2593e9fdac95acd1719b1bb6cafbe729997689190b64cb58bc83db + checksum/config: 3578b34b0cceb9c01afbfc50da9b297906412107c73cc23ae5a9fb9abe74364c kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -116,11 +116,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 - name: REDIS_USERNAME valueFrom: secretKeyRef: diff --git a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml index afd7eb3a9f..e8fce16ffa 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml @@ -141,7 +141,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 diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index 0c8fd4f371..fd86082a7e 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 44058e171d3f17fce89419a56b1485723fe7fc2cdfd03afea7bf75db4207a4a1 + checksum/config: 9c0deba254b35108ce13c4c1903b1894cbfbf924b3b285ece073d9b636c29863 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml index 3bbc283474..de1e49f450 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml @@ -141,7 +141,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 diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 172a580a9c..50dca34b59 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 260e25f3f69880f05441f3f294e072bd848125fac4bcd4319d94d4361dc59aff + checksum/config: e0c7fdcdccb1ee8d8e191c70097f8cebfff33546c0dc2bf2d4ba83f114c22c25 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml index 965fc97332..f8dfede404 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml @@ -140,7 +140,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 diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index 0ac48788f4..e27ae36501 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 3980cbc94e8588f24013391b29a825dbde2a96e1ec388c08269691b9352abbe4 + checksum/config: 8cbfdd1dee09d8e1ccc6e82ffe4f900dcde02b03c54450790d5493d3ad665cb4 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml index b96994c43b..c63a390590 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml @@ -140,7 +140,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 diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index 16b3086cb8..b1053de2ca 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: b529642c092efdfd13bba3d5f980a24e1b8cdb4c62f02f6d5b997a02d8a0e530 + checksum/config: 710a9e155ba1e8a234e56eade0d4feec1bbe5d23b7493ddcfe96110e5805b7d0 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml index 5e5b7e2cb6..f9f0cf4292 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index 6de8aa05e3..fc51e3a289 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 73d1501dc7a38efa3083ec32f0269bfa8e172e82e1a4e9ba8386a51fec946b0e + checksum/config: 9343d86abbbf7dd2b6d588124ab613ad241dfd39c8d138297e4ff3bdfe839215 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml index 99043e77f2..663a5a447b 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml @@ -262,7 +262,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 diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index f3b1f7f9d7..c443e88b69 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 09e785c472a5b6a4dd50499c3732428fc22171e1b5473a4e01a2abb6715b0b05 + checksum/config: 32d6799629be439ea0fa354d3b1e1f91091ec8b03bde85870c85838fa4b4b8f1 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml index 0bcf61e32a..de3476a93c 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index 62a564671e..8ff07756fc 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5937d2cb45e038daaee835b35bc702aaf2659e40c0c14a0fe572913db7244240 + checksum/config: 4afcd938e39e7c9ca40fed841694074c4b93ef7ca239e27cb78164f256b79dc0 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml index 668f2d8e73..139d7187bd 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml @@ -140,7 +140,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 diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index 7943b89848..46e0b0aede 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1e32eac4f667caac8dd1de657404f6a6dace67231ccc0aa5c06f9480aa9a7590 + checksum/config: 109a34ada5fdbe442a1cea77957cc5bec656a59d506f8497b0f64770a230a09c kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml index 147da7a257..411bc0d40a 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml @@ -157,7 +157,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 diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index e3c68993cc..0597938d68 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 7554abf46ab028d354e49180e87fdd1f9d9d10dcdf51e1a4a56f46e3d904014a + checksum/config: 2872074fc1f7e6e087a3652dc750fa9ea3561f26fd5d2e98c476e477dd3ca7cc kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -188,11 +188,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: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml index 147da7a257..411bc0d40a 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml @@ -157,7 +157,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 diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index 73eb399592..ea1d01a399 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 53caf13b9c9086e20ee4c90876d945d56702725ef6de9e9ea3789e3d8d1d9b5b + checksum/config: f06168115df4b166185f3b66b518cda0d69835a9a59894db8a72cab8e694f899 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -188,11 +188,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: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml index 0e0bc78568..54b5d018f4 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml @@ -261,7 +261,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 diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 746179c782..3811261d61 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: de5d3ae90cbcd19a9c148036091ee5485566c13f8e648a0f00f0e4983faaeb58 + checksum/config: a5e0912f6068cb152a6e77a3b8c251d48396619dbff5f11dba86e98bdfc20d1d kubectl.kubernetes.io/default-container: otel-collector spec: dnsPolicy: ClusterFirstWithHostNet diff --git a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml index 2d0bc49b32..223a960377 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -317,7 +317,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 diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index dee0d1bc5f..a5dbbcb90d 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 78a10474e8b702d1fe8ced8a9a37dd36087a49c264bc332f52c4f0f9ea7d34b6 + checksum/config: 3775265cfa376e304096ba49634c0bc60efa287083d328b475e4c2477bb7afd9 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -140,11 +140,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: diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml index a1de392c4c..9baf951945 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -180,7 +180,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 diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index d1c45f583a..d6dad32986 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: b2fc207376ece257668dd8bb8f627523fb3a7948a8368fe171f92a1caf04cec5 + checksum/config: d50d8169a27518fd76ad489d1cb8ef1b47e6301d9a507b259752268a52b18d06 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -99,11 +99,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: diff --git a/examples/only-metrics/rendered_manifests/configmap-agent.yaml b/examples/only-metrics/rendered_manifests/configmap-agent.yaml index 22b0e64a65..171573e189 100644 --- a/examples/only-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-agent.yaml @@ -134,7 +134,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 diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index 918506418f..425487acd0 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 738a15883e1fad0a5d57991f4f1196c941e5896018edd8ed2c55128f48dffa49 + checksum/config: d154e83a90699f1647cd3836c92bcb38e3424188ad3e0eedccae98905a79bd76 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -99,11 +99,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: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml index bc30cf2e9d..86299e68fa 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml @@ -143,7 +143,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 diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index 8c25d03e05..c0f14ae98c 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 9475b075d008d38b3a92668498e5e1dfa2ce216892835734d6e2fe5712c39c9a + checksum/config: eb8be293b222b3aaa99cd6324cfed67702ba9685e87d7f8e71d49fe0b2f43502 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/target-allocator/rendered_manifests/configmap-agent.yaml b/examples/target-allocator/rendered_manifests/configmap-agent.yaml index 1500af6a5b..8917e420ae 100644 --- a/examples/target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index 12792cb098..3dc613065b 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 9678253eb639bc96ac92027aa1691339013bc9dcde3fe6c33eca6138d3247524 + checksum/config: c61c9e9893167bca52445f48aa1e466f73b15189d99821e46fac5b507798c67f kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/examples/use-proxy/rendered_manifests/configmap-agent.yaml b/examples/use-proxy/rendered_manifests/configmap-agent.yaml index eb1907489c..ece40e3c75 100644 --- a/examples/use-proxy/rendered_manifests/configmap-agent.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index 515bc6c702..4a698031a9 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -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 @@ -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 - name: HTTPS_PROXY value: 192.168.0.10 diff --git a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml index b467adc113..f8c92cb176 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml @@ -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 diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index 992aeebe5e..06688cfb00 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 9a94044d2fcdf6437ff8c03c72d6c282eee311428639107cf7d1f2391a31c29c + checksum/config: fe1bd8cc585a8584abd85e61b664d57fb6a30fc496bd9bea081da81e2f67e86e kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -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: diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl index a1e7c2e50f..f81525da60 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl @@ -56,6 +56,10 @@ receivers: cpu: disk: filesystem: + # exclude mount points that are accessible from the collector container + exclude_mount_points: + match_type: regexp + mount_points: [/var/.*] memory: network: # System load average metrics https://en.wikipedia.org/wiki/Load_(computing) diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 84d2389026..b3daa1633e 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -315,15 +315,6 @@ spec: name: {{ include "splunk-otel-collector.secret" . }} key: splunk_platform_hec_token {{- end }} - {{- if eq (include "splunk-otel-collector.metricsEnabled" .) "true" }} - {{- if not .Values.isWindows }} - # 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 - {{- end }} - {{- end }} {{- with $agent.extraEnvs }} {{- . | toYaml | nindent 10 }} {{- end }}