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] 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"
--
GitLab