diff --git a/jsonnet/kube-prometheus/components/alertmanager.libsonnet b/jsonnet/kube-prometheus/components/alertmanager.libsonnet index bb29d26e6b2a7b684c63ea3557498e2eb790f79d..df45a5f949cf1500fb15abccf857662b7723704a 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: { @@ -50,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 f265e096cb4caa90dfd9a3e13762e529e5625bf9..ceb65054039643d47911db71392215eeaec7b211 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" @@ -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