test fs/disk scrapers with hostmetrics in collector container

signalfx · Nov 22, 2024 · 9dee17d · 9dee17d
1 parent b2cd8d6
commit 9dee17d
Showing 1 changed file with 41 additions and 35 deletions.
diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml
@@ -321,7 +321,7 @@ spec:
           # is resolved fall back to previous gopsutil mountinfo path:
           # https://github.com/shirou/gopsutil/issues/1271
           - name: HOST_PROC_MOUNTINFO
-            value: /proc/self/mountinfo
+            value: /hostfs/proc/1/mountinfo
           {{- end }}
           {{- end }}
           {{- with $agent.extraEnvs }}
@@ -357,24 +357,27 @@ spec:
           name: hostfs
           readOnly: true
         {{- else }}
-        - mountPath: /hostfs/dev
-          name: host-dev
-          readOnly: true
-        - mountPath: /hostfs/etc
-          name: host-etc
-          readOnly: true
-        - mountPath: /hostfs/proc
-          name: host-proc
-          readOnly: true
-        - mountPath: /hostfs/run/udev/data
-          name: host-run-udev-data
-          readOnly: true
-        - mountPath: /hostfs/sys
-          name: host-sys
-          readOnly: true
-        - mountPath: /hostfs/var/run/utmp
-          name: host-var-run-utmp
+        - mountPath: /hostfs
+          name: hostfs
           readOnly: true
+        # - mountPath: /hostfs/dev
+        #   name: host-dev
+        #   readOnly: true
+        # - mountPath: /hostfs/etc
+        #   name: host-etc
+        #   readOnly: true
+        # - mountPath: /hostfs/proc
+        #   name: host-proc
+        #   readOnly: true
+        # - mountPath: /hostfs/run/udev/data
+        #   name: host-run-udev-data
+        #   readOnly: true
+        # - mountPath: /hostfs/sys
+        #   name: host-sys
+        #   readOnly: true
+        # - mountPath: /hostfs/var/run/utmp
+        #   name: host-var-run-utmp
+        #   readOnly: true
         {{- end }}
         {{- end }}
         {{- if or .Values.splunkPlatform.clientCert .Values.splunkPlatform.clientKey .Values.splunkPlatform.caFile }}
@@ -521,24 +524,27 @@ spec:
         hostPath:
           path: "C:\\"
       {{- else }}
-      - name: host-dev
-        hostPath:
-          path: /dev
-      - name: host-etc
-        hostPath:
-          path: /etc
-      - name: host-proc
-        hostPath:
-          path: /proc
-      - name: host-run-udev-data
-        hostPath:
-          path: /run/udev/data
-      - name: host-sys
-        hostPath:
-          path: /sys
-      - name: host-var-run-utmp
+      - name: hostfs
         hostPath:
-          path: /var/run/utmp
+          path: /
+      # - name: host-dev
+      #   hostPath:
+      #     path: /dev
+      # - name: host-etc
+      #   hostPath:
+      #     path: /etc
+      # - name: host-proc
+      #   hostPath:
+      #     path: /proc
+      # - name: host-run-udev-data
+      #   hostPath:
+      #     path: /run/udev/data
+      # - name: host-sys
+      #   hostPath:
+      #     path: /sys
+      # - name: host-var-run-utmp
+      #   hostPath:
+      #     path: /var/run/utmp
       {{- end }}
       {{- end }}
       {{- if or .Values.splunkPlatform.clientCert .Values.splunkPlatform.clientKey .Values.splunkPlatform.caFile }}