From af9c1539e32017fe9f37d47459ddc47b3b501bed Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@yunify.com>
Date: Mon, 17 Feb 2020 21:44:49 +0800
Subject: [PATCH 1/2] Adjust Alertmanager inhibit conditions

Signed-off-by: Benjamin <benjamin@yunify.com>
---
 jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
index bdbe57a2..2742b7fe 100644
--- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
+++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
@@ -25,7 +25,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           target_match_re: {
             severity: 'warning|info',
           },
-          equal: ['alertname'],
+          equal: ['namespace', 'alertname'],
         }, {
           source_match: {
             severity: 'warning',
@@ -33,7 +33,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           target_match_re: {
             severity: 'info',
           },
-          equal: ['alertname'],
+          equal: ['namespace', 'alertname'],
         }],
         route: {
           group_by: ['namespace'],

From 1144885da0d035d7f277df368d30901d4b31d34a Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@yunify.com>
Date: Mon, 17 Feb 2020 22:02:07 +0800
Subject: [PATCH 2/2] regenerate

Signed-off-by: Benjamin <benjamin@yunify.com>
---
 manifests/alertmanager-secret.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/alertmanager-secret.yaml b/manifests/alertmanager-secret.yaml
index ecd30d30..e019922b 100644
--- a/manifests/alertmanager-secret.yaml
+++ b/manifests/alertmanager-secret.yaml
@@ -10,12 +10,14 @@ stringData:
       "resolve_timeout": "5m"
     "inhibit_rules":
     - "equal":
+      - "namespace"
       - "alertname"
       "source_match":
         "severity": "critical"
       "target_match_re":
         "severity": "warning|info"
     - "equal":
+      - "namespace"
       - "alertname"
       "source_match":
         "severity": "warning"