Merge branch '1103-kubeproxydown-alert-after-upgrading-to-kube-prometehus-stack-25-0-0'

.gitlab-ci.yml

@@ -693,7 +693,7 @@ prometheus-alerts:
     RESOURCE: "kube-prometheus-stack"
   script:
     - *debug_information
-    - export BASIC_AUTH_PW=$(python3 -m stackspin $HOSTNAME secrets | grep stackspin-prometheus-basic-auth | cut -d'=' -f2)
+    - export BASIC_AUTH_PW=$(python3 -m stackspin $HOSTNAME secrets | grep stackspin-prometheus-basic-auth | awk '{ print $4 }')
     - cd test/
     - bash ../.gitlab/ci_scripts/retry_cmd_until_success.sh 30 10 pytest -s -m prometheus
   extends:

flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml

@@ -13,11 +13,14 @@ data:
     kubeEtcd:
       enabled: false
 
-    # Disable kube-controller-manager and kube-scheduler monitoring. See https://github.com/cablespaghetti/k3s-monitoring/issues/2
+    # Disable kube-controller-manager, kube-scheduler and kube-proxy monitoring.
+    # See https://github.com/cablespaghetti/k3s-monitoring/issues/2
     kubeControllerManager:
       enabled: false
     kubeScheduler:
       enabled: false
+    kubeProxy:
+      enabled: false
 
     # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml#L115
     alertmanager:

test/pytest/test_prometheus.py

@@ -21,8 +21,7 @@ def ignore_alert(alert):
         return True
 
     # Ignore issues fom high load during installation phase
-    # KubeProxyDown: https://open.greenhost.net/stackspin/stackspin/-/issues/1105
-    if re.search(r"(KubeAPIDown|KubeletDown|NodeFilesystemSpaceFillingUp|NodeClockNotSynchronising|KubeProxyDown)",
+    if re.search(r"(KubeAPIDown|KubeletDown|NodeFilesystemSpaceFillingUp|NodeClockNotSynchronising)",
         alert["labels"]["alertname"]):
         return True
     # Ignore nextcloud cron jobs (https://open.greenhost.net/stackspin/stackspin/-/issues/984)