Exclude devices with /snap/* mount points from filesystem scraper

Don't scrape FS metrics from devices with /snap/* mount points to avoid errors since they are not mounted by default.
signalfx · Dec 12, 2024 · a7366d6 · a7366d6
1 parent 387c3ea
commit a7366d6
Show file tree

Hide file tree

Showing 62 changed files with 71 additions and 31 deletions.
diff --git a/.chloggen/do-not-scrape-fs-metrics-from-snap-mount.yaml b/.chloggen/do-not-scrape-fs-metrics-from-snap-mount.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: Don't scrape FS metrics from devices with /snap/* mount points to avoid errors since they are not mounted by default.
+# One or more tracking issues related to the change
+issues: [1569]
diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml
@@ -313,6 +313,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 62b12f9782be458e4d851b56b3736779d9fa819b31d602c2690a85e1e2651398
+        checksum/config: 1d176dd4129edbf899e3fe13cc4149b25fb958a919a06d9d18fafff2e6712d76
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml
@@ -262,6 +262,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 6b91121b6bca3137df4e27936265ce0db0896ac28a41c32b655bd82f566ca63b
+        checksum/config: aa7e284d41c63f94b99a892148b5236188228ec2fb78d79db6adc7cb6b63d066
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml
@@ -144,6 +144,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 98e82d01663b276d8e9d39d0c067119a5e8faecdac14b95bed092414f1d26e4a
+        checksum/config: bbfeb596dd1f8b462cd016086c2d7dd088f6c91ec635bd2a3a91ab1438e9000f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml
@@ -147,6 +147,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           load: null
           memory: null
           network: null

diff --git 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: c516877b22714b6549007864d7a67fbb8247f2e9c7b3f3103cb758e734b07fac
+        checksum/config: 280d160b65220a7914db3884fdcbac9addf717f31074dd956f1ef4c63c8e02a9
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml
@@ -297,6 +297,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           load: null
           memory: null
           network: null

diff --git 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: 6e673abe5511ec2032b2d3ae7db8f3753ed1fde726389c86bfdf44477423e8b6
+        checksum/config: 41307a6d31abba2345575c2d1e0f21991ddefdb1885cfa0420019907cf33d9df
         kubectl.kubernetes.io/default-container: otel-collector
         sidecar.istio.io/inject: "false"
     spec:

diff --git a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml
@@ -144,6 +144,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 777574d73f3948712985d93f22b80f7fd878e5b96d08e33ca35a949b7c826943
+        checksum/config: 22e0796b2112a62d974f6cb726da00ba141343ab417df17eef8730f069013e0f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml
@@ -128,6 +128,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 83e5487eaf9d38ed3e7b0e1794194e13e9999148ea9b243cb722b20c2e65f69e
+        checksum/config: fd3ab15d8fcae59773f4b3c463afe9314887b43b8f3d740384c2f1ebc29ca761
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml
@@ -149,6 +149,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: bd7c6d887d5635760fdfce06ba65107fbebf3ce9b25eb718b654b1f7274d767a
+        checksum/config: 4fab4cf7aa8d70b76b718ad4f2a75df897a6df32a268e4b3bedf5647bcb4176b
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/crio-logging/rendered_manifests/configmap-agent.yaml b/examples/crio-logging/rendered_manifests/configmap-agent.yaml
@@ -144,6 +144,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           load: null
           memory: null
           network: null

diff --git 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: 777574d73f3948712985d93f22b80f7fd878e5b96d08e33ca35a949b7c826943
+        checksum/config: 22e0796b2112a62d974f6cb726da00ba141343ab417df17eef8730f069013e0f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/default/rendered_manifests/configmap-agent.yaml b/examples/default/rendered_manifests/configmap-agent.yaml
@@ -144,6 +144,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           load: null
           memory: null
           network: null

diff --git 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: 777574d73f3948712985d93f22b80f7fd878e5b96d08e33ca35a949b7c826943
+        checksum/config: 22e0796b2112a62d974f6cb726da00ba141343ab417df17eef8730f069013e0f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml
@@ -350,6 +350,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: b004ddf898fc1caa94ef51614938704a33563cdd32c01bdb097a597162642cc3
+        checksum/config: 7a419c4b0a79213612f87205e4616e855125f0bef934b1863eee796345135e0e
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml
@@ -144,6 +144,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           load: null
           memory: null
           network: null

diff --git 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: 6304ccf9319530453afd837d241e5b5af1b36c4de40662d7b5bad40b004a258b
+        checksum/config: 671c53e3f25221913edd461c9206e127085a92b87f9f2638b5596c11e0c0d522
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml
@@ -146,6 +146,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           load: null
           memory: null
           network: null

diff --git 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: dcc20675c31a093e01099e1db64434a6f6cccfa8c8d1949d3b2173673d5221ec
+        checksum/config: cefdc87750de06870b4180bb6067431b920d1c14d33851a59102572eb362600f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml
@@ -146,6 +146,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           load: null
           memory: null
           network: null

diff --git 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: a8fe90475cc286359dd2944b3a3af5b5e2b6f776e987da995f421216e348a41e
+        checksum/config: 0704c7dd27ee2f4c9b4f36a3b100c2f712558fcb5ad4c98ea42d08b82cf1fb8f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml
@@ -145,6 +145,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: c3292448f4b1f0def03cfde9e2772349cb2a533c3a70a412e4cbbf5b1507b787
+        checksum/config: c73a792443e58eddc6cab19fc0c6c59afa10d69e86800c1486124881d3ab13af
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml
@@ -145,6 +145,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           load: null
           memory: null
           network: null

diff --git 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: 56cf37f1b1eff2f7a9e128a839efab64ec48afc5ae1116006d670e079f8a71d4
+        checksum/config: a0ff77949d3f96625e8767967b541b2ce8b4876adaa2a28bbbd8d1a90802b315
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml
@@ -144,6 +144,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           load: null
           memory: null
           network: null

diff --git 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: 8e095feeacd3811fb1b231b8f0d86f4c782ca875aee425d6335535d2572c5bf4
+        checksum/config: fe0d5f85c417a34636f3d1e0f8e437294ebb0351274dd881e30b10ff60f5ffd0
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

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
@@ -267,6 +267,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 79059b846a30bbc5b483a786ee108a4112a98f1886fdef97969b9f3687000749
+        checksum/config: 0ba48a34098cda92f6fb02c2841f2f753cb7876e6ea5dffabcbf0bac9e03c1ef
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml
@@ -350,6 +350,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 1a4382f5b77cb685de6686b307d6ea58f3a3c3da04463d088e8080f8f11c1fb1
+        checksum/config: 7cc86597158f597be75d565134baced14abe4f9c90a775280d1984273a0fddf8
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml
@@ -145,6 +145,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: aa6537d1dac202cd66363f17ce3173efe1dad71dfecd6a5b32e48837970dccc5
+        checksum/config: 96c68c382a10c56dd1a1e849070e8908af91e34f3cbdcb0765a5fd1d48b5f05c
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

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
@@ -162,6 +162,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -33,7 +33,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 7aec05b09489238f40b5db4c375900ed0fbd7a4295df4a732a879b5d166bd6cd
+        checksum/config: 27344b3239d6d96de144fcd1bbc4f4afeb7e1a1ddd1278500ff20f4be007c758
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml
@@ -162,6 +162,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -33,7 +33,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: fa9cd8190ae8522320ba56f2574d27d32e937c4f331edac13af02c307eb9bfda
+        checksum/config: 271966b3c4bf87403953ee5bb5d6b2dc3d4a3509fc70eefc43c59ee83ddee84f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml
@@ -266,6 +266,7 @@ data:
               match_type: regexp
               mount_points:
               - /var/.*
+              - /snap/.*
           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
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 0f820425d8e3ec1265f78ed76a73995fc647a0a05cfa263b2621674c31302c5e
+        checksum/config: 1a7a40557cedd9e8836901a086c4a63924ecbe670a5ed09051b0b3885c2684d3
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       dnsPolicy: ClusterFirstWithHostNet