From 9bcad2481bce5b1bfbab8ab3dd1456072e89d619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri.vosandi@gmail.com>
Date: Fri, 22 Nov 2024 05:59:34 +0200
Subject: [PATCH] monitoring: Update node-exporter

---
 monitoring/node-exporter.yaml | 36 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/monitoring/node-exporter.yaml b/monitoring/node-exporter.yaml
index 057fe47..8eb9bbc 100644
--- a/monitoring/node-exporter.yaml
+++ b/monitoring/node-exporter.yaml
@@ -33,7 +33,7 @@ spec:
   groups:
     - name: node-exporter
       rules:
-        - alert: ZfsOfflinePool
+        - alert: ZfsDegradedPool
           expr: node_zfs_zpool_state{state!="online"} > 0
           for: 1m
           labels:
@@ -377,13 +377,19 @@ spec:
         - name: node-exporter
           args:
             - --web.listen-address=0.0.0.0:9101
-            - --path.sysfs=/host/sys
-            - --path.rootfs=/host/root
+            - --no-collector.bonding
+            - --no-collector.fibrechannel
+            - --no-collector.infiniband
+            - --no-collector.nfs
+            - --no-collector.nfsd
+            - --no-collector.nvme
+            - --no-collector.zfs
+            - --no-collector.tapestats
             - --no-collector.wifi
-            - --collector.filesystem.mount-points-exclude=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
+            - --collector.filesystem.mount-points-exclude=^/(dev|proc|sys|var/lib/docker|var/lib/kubelet/pods|run)(/.+)?$
             - --collector.netclass.ignored-devices=^(veth|cali|vxlan|cni|vnet|tap|lo|wg)
             - --collector.netdev.device-exclude=^(veth|cali|vxlan|cni|vnet|tap|lo|wg)
-            - --collector.diskstats.ignored-devices=^(sr[0-9][0-9]*)$
+            - --collector.diskstats.ignored-devices=^(sr|loop)[0-9][0-9]*$
           image: mirror.gcr.io/prom/node-exporter:v1.8.2
           resources:
             limits:
@@ -393,13 +399,11 @@ spec:
               cpu: 5m
               memory: 20Mi
           volumeMounts:
-            - mountPath: /host/sys
-              mountPropagation: HostToContainer
-              name: sys
+            - name: sys
+              mountPath: /sys
               readOnly: true
-            - mountPath: /host/root
-              mountPropagation: HostToContainer
-              name: root
+            - name: proc
+              mountPath: /proc
               readOnly: true
           ports:
             - containerPort: 9101
@@ -419,9 +423,9 @@ spec:
       tolerations:
         - operator: Exists
       volumes:
-        - hostPath:
+        - name: sys
+          hostPath:
             path: /sys
-          name: sys
-        - hostPath:
-            path: /
-          name: root
+        - name: proc
+          hostPath:
+            path: /proc