From 965bec0ad71603cf69fac4af861e4ab14410dc42 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 3 Dec 2019 20:02:47 +0800 Subject: [PATCH 1/3] Change Alertmanager group by condition Signed-off-by: Benjamin --- jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index c28eb765..635f34eb 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -19,7 +19,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; resolve_timeout: '5m', }, route: { - group_by: ['job'], + group_by: ['namespace'], group_wait: '30s', group_interval: '5m', repeat_interval: '12h', From 420425d88efdf6d0e5980c0acd251d5ccaab41ba Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 3 Dec 2019 23:46:08 +0800 Subject: [PATCH 2/3] regenerate Signed-off-by: Benjamin --- manifests/alertmanager-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/alertmanager-secret.yaml b/manifests/alertmanager-secret.yaml index cdfe51c7..e9fb9f7d 100644 --- a/manifests/alertmanager-secret.yaml +++ b/manifests/alertmanager-secret.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - alertmanager.yaml: Imdsb2JhbCI6CiAgInJlc29sdmVfdGltZW91dCI6ICI1bSIKInJlY2VpdmVycyI6Ci0gIm5hbWUiOiAibnVsbCIKInJvdXRlIjoKICAiZ3JvdXBfYnkiOgogIC0gImpvYiIKICAiZ3JvdXBfaW50ZXJ2YWwiOiAiNW0iCiAgImdyb3VwX3dhaXQiOiAiMzBzIgogICJyZWNlaXZlciI6ICJudWxsIgogICJyZXBlYXRfaW50ZXJ2YWwiOiAiMTJoIgogICJyb3V0ZXMiOgogIC0gIm1hdGNoIjoKICAgICAgImFsZXJ0bmFtZSI6ICJXYXRjaGRvZyIKICAgICJyZWNlaXZlciI6ICJudWxsIg== + alertmanager.yaml: Imdsb2JhbCI6CiAgInJlc29sdmVfdGltZW91dCI6ICI1bSIKInJlY2VpdmVycyI6Ci0gIm5hbWUiOiAibnVsbCIKInJvdXRlIjoKICAiZ3JvdXBfYnkiOgogIC0gIm5hbWVzcGFjZSIKICAiZ3JvdXBfaW50ZXJ2YWwiOiAiNW0iCiAgImdyb3VwX3dhaXQiOiAiMzBzIgogICJyZWNlaXZlciI6ICJudWxsIgogICJyZXBlYXRfaW50ZXJ2YWwiOiAiMTJoIgogICJyb3V0ZXMiOgogIC0gIm1hdGNoIjoKICAgICAgImFsZXJ0bmFtZSI6ICJXYXRjaGRvZyIKICAgICJyZWNlaXZlciI6ICJudWxsIg== kind: Secret metadata: name: alertmanager-main From 03f7adcf92fdca59066c056f61bfd3e919e9e9b4 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Wed, 4 Dec 2019 10:14:42 +0800 Subject: [PATCH 3/3] regenerate Signed-off-by: Benjamin --- jsonnetfile.lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 6cbd0aae..d97e7f93 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -26,7 +26,7 @@ "name": "grafana-builder", "source": { "git": { - "remote": "https://github.com/kausalco/public", + "remote": "https://github.com/grafana/jsonnet-libs", "subdir": "grafana-builder" } },