alertmanager: fix accidental cross-service silences (#7070)

Also, fix incorrect match types.
sapcc · Sep 16, 2024 · 672c0e8 · 672c0e8
1 parent b0bc35b
commit 672c0e8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/global/prometheus-alertmanager-operated/Chart.yaml b/global/prometheus-alertmanager-operated/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 type: application
 description: Prometheus Alertmanager via operator.
 name: prometheus-alertmanager-operated
-version: 4.5.0
+version: 4.5.1
 
 dependencies:
   - alias: prometheus-alertmanager

diff --git a/global/prometheus-alertmanager-operated/templates/am-config-inhibit-rules-base.yaml b/global/prometheus-alertmanager-operated/templates/am-config-inhibit-rules-base.yaml
@@ -31,19 +31,19 @@ spec:
         - 'alertname'
         - 'cluster'
     - sourceMatch:
-       - matchType: "="
-         name: severity
-         value: 'critical'
-       - matchType: "="
-         name: context
-         value: '.+'
+        - matchType: "="
+          name: severity
+          value: 'critical'
+        - matchType: "!="
+          name: context
+          value: ''
       targetMatch:
         - matchType: "="
           name: severity
           value: 'warning'
-        - matchType: "="
+        - matchType: "!="
           name: context
-          value: '.+'
+          value: ''
       equal:
         - 'region'
         - 'context'
@@ -52,10 +52,16 @@ spec:
         - matchType: "=~"
           name: severity
           value: 'critical|warning'
+        - matchType: "!="
+          name: context
+          value: ''
       targetMatch:
         - matchType: "="
           name: severity
           value: 'info'
+        - matchType: "!="
+          name: context
+          value: ''
       equal:
         - 'region'
         - 'context'