Merge pull request #417 from benjaminhuo/alertmanager

Adjust Alertmanager inhibit conditions

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'],

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"