From 72f6ff37585cf3b99c333bddb3cce3c12cc92806 Mon Sep 17 00:00:00 2001
From: Andrei Nistor <andrei_nistor@smart-x.net>
Date: Mon, 15 Nov 2021 18:38:49 +0200
Subject: [PATCH 1/2] Refactor deprecated inhibit rules matchers

---
 .../components/alertmanager.libsonnet            | 16 ++++------------
 manifests/alertmanager-secret.yaml               | 16 ++++++++--------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/jsonnet/kube-prometheus/components/alertmanager.libsonnet b/jsonnet/kube-prometheus/components/alertmanager.libsonnet
index bb29d26e..c77059b6 100644
--- a/jsonnet/kube-prometheus/components/alertmanager.libsonnet
+++ b/jsonnet/kube-prometheus/components/alertmanager.libsonnet
@@ -27,20 +27,12 @@ local defaults = {
       resolve_timeout: '5m',
     },
     inhibit_rules: [{
-      source_match: {
-        severity: 'critical',
-      },
-      target_match_re: {
-        severity: 'warning|info',
-      },
+      source_matchers: ['severity = critical'],
+      target_matchers: ['severity =~ warning|info'],
       equal: ['namespace', 'alertname'],
     }, {
-      source_match: {
-        severity: 'warning',
-      },
-      target_match_re: {
-        severity: 'info',
-      },
+      source_matchers: ['severity = warning'],
+      target_matchers: ['severity = info'],
       equal: ['namespace', 'alertname'],
     }],
     route: {
diff --git a/manifests/alertmanager-secret.yaml b/manifests/alertmanager-secret.yaml
index f265e096..ff3328f0 100644
--- a/manifests/alertmanager-secret.yaml
+++ b/manifests/alertmanager-secret.yaml
@@ -17,17 +17,17 @@ stringData:
     - "equal":
       - "namespace"
       - "alertname"
-      "source_match":
-        "severity": "critical"
-      "target_match_re":
-        "severity": "warning|info"
+      "source_matchers":
+      - "severity = critical"
+      "target_matchers":
+      - "severity =~ warning|info"
     - "equal":
       - "namespace"
       - "alertname"
-      "source_match":
-        "severity": "warning"
-      "target_match_re":
-        "severity": "info"
+      "source_matchers":
+      - "severity = warning"
+      "target_matchers":
+      - "severity = info"
     "receivers":
     - "name": "Default"
     - "name": "Watchdog"

From 30175b5e3c66bc33f314225ed312e61815d12aec Mon Sep 17 00:00:00 2001
From: Andrei Nistor <andrei_nistor@smart-x.net>
Date: Tue, 16 Nov 2021 14:11:30 +0200
Subject: [PATCH 2/2] Use matchers in routing tree

---
 jsonnet/kube-prometheus/components/alertmanager.libsonnet | 4 ++--
 manifests/alertmanager-secret.yaml                        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jsonnet/kube-prometheus/components/alertmanager.libsonnet b/jsonnet/kube-prometheus/components/alertmanager.libsonnet
index c77059b6..df45a5f9 100644
--- a/jsonnet/kube-prometheus/components/alertmanager.libsonnet
+++ b/jsonnet/kube-prometheus/components/alertmanager.libsonnet
@@ -42,8 +42,8 @@ local defaults = {
       repeat_interval: '12h',
       receiver: 'Default',
       routes: [
-        { receiver: 'Watchdog', match: { alertname: 'Watchdog' } },
-        { receiver: 'Critical', match: { severity: 'critical' } },
+        { receiver: 'Watchdog', matchers: ['alertname = Watchdog'] },
+        { receiver: 'Critical', matchers: ['severity = critical'] },
       ],
     },
     receivers: [
diff --git a/manifests/alertmanager-secret.yaml b/manifests/alertmanager-secret.yaml
index ff3328f0..ceb65054 100644
--- a/manifests/alertmanager-secret.yaml
+++ b/manifests/alertmanager-secret.yaml
@@ -40,10 +40,10 @@ stringData:
       "receiver": "Default"
       "repeat_interval": "12h"
       "routes":
-      - "match":
-          "alertname": "Watchdog"
+      - "matchers":
+        - "alertname = Watchdog"
         "receiver": "Watchdog"
-      - "match":
-          "severity": "critical"
+      - "matchers":
+        - "severity = critical"
         "receiver": "Critical"
 type: Opaque