Merge pull request #1508 from andrein/alertmanager-deprecated-inhibition-rules

jsonnet/kube-prometheus/components/alertmanager.libsonnet

@@ -27,20 +27,12 @@ local defaults = {
       resolve_timeout: '5m',
     },
     inhibit_rules: [{
-      source_match: {
+      source_matchers: ['severity = critical'],
-        severity: 'critical',
+      target_matchers: ['severity =~ warning|info'],
-      },
-      target_match_re: {
-        severity: 'warning|info',
-      },
       equal: ['namespace', 'alertname'],
     }, {
-      source_match: {
+      source_matchers: ['severity = warning'],
-        severity: 'warning',
+      target_matchers: ['severity = info'],
-      },
-      target_match_re: {
-        severity: 'info',
-      },
       equal: ['namespace', 'alertname'],
     }],
     route: {
@@ -50,8 +42,8 @@ local defaults = {
       repeat_interval: '12h',
       receiver: 'Default',
       routes: [
-        { receiver: 'Watchdog', match: { alertname: 'Watchdog' } },
+        { receiver: 'Watchdog', matchers: ['alertname = Watchdog'] },
-        { receiver: 'Critical', match: { severity: 'critical' } },
+        { receiver: 'Critical', matchers: ['severity = critical'] },
       ],
     },
     receivers: [

manifests/alertmanager-secret.yaml

@@ -17,17 +17,17 @@ stringData:
     - "equal":
       - "namespace"
       - "alertname"
-      "source_match":
+      "source_matchers":
-        "severity": "critical"
+      - "severity = critical"
-      "target_match_re":
+      "target_matchers":
-        "severity": "warning|info"
+      - "severity =~ warning|info"
     - "equal":
       - "namespace"
       - "alertname"
-      "source_match":
+      "source_matchers":
-        "severity": "warning"
+      - "severity = warning"
-      "target_match_re":
+      "target_matchers":
-        "severity": "info"
+      - "severity = info"
     "receivers":
     - "name": "Default"
     - "name": "Watchdog"
@@ -40,10 +40,10 @@ stringData:
       "receiver": "Default"
       "repeat_interval": "12h"
       "routes":
-      - "match":
+      - "matchers":
-          "alertname": "Watchdog"
+        - "alertname = Watchdog"
         "receiver": "Watchdog"
-      - "match":
+      - "matchers":
-          "severity": "critical"
+        - "severity = critical"
         "receiver": "Critical"
 type: Opaque