easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #309 from benjaminhuo/master

Browse Source 
Group alert by namespace instead of job
This commit is contained in:
Frederic Branczyk
2019-12-04 08:38:04 +01:00
committed by GitHub
parent d22bad8293 03f7adcf92
commit cb0e6e2c89
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
View File

@@ -19,7 +19,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
resolve_timeout: '5m', resolve_timeout: '5m',
}, },
route: { route: {
group_by: ['job'], group_by: ['namespace'],
group_wait: '30s', group_wait: '30s',
group_interval: '5m', group_interval: '5m',
repeat_interval: '12h', repeat_interval: '12h',

2
jsonnetfile.lock.json
View File

@@ -26,7 +26,7 @@
"name": "grafana-builder", "name": "grafana-builder",
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/kausalco/public", "remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },

2
manifests/alertmanager-secret.yaml
View File

@@ -1,6 +1,6 @@
apiVersion: v1 apiVersion: v1
data: data:
alertmanager.yaml: Imdsb2JhbCI6CiAgInJlc29sdmVfdGltZW91dCI6ICI1bSIKInJlY2VpdmVycyI6Ci0gIm5hbWUiOiAibnVsbCIKInJvdXRlIjoKICAiZ3JvdXBfYnkiOgogIC0gImpvYiIKICAiZ3JvdXBfaW50ZXJ2YWwiOiAiNW0iCiAgImdyb3VwX3dhaXQiOiAiMzBzIgogICJyZWNlaXZlciI6ICJudWxsIgogICJyZXBlYXRfaW50ZXJ2YWwiOiAiMTJoIgogICJyb3V0ZXMiOgogIC0gIm1hdGNoIjoKICAgICAgImFsZXJ0bmFtZSI6ICJXYXRjaGRvZyIKICAgICJyZWNlaXZlciI6ICJudWxsIg== alertmanager.yaml: Imdsb2JhbCI6CiAgInJlc29sdmVfdGltZW91dCI6ICI1bSIKInJlY2VpdmVycyI6Ci0gIm5hbWUiOiAibnVsbCIKInJvdXRlIjoKICAiZ3JvdXBfYnkiOgogIC0gIm5hbWVzcGFjZSIKICAiZ3JvdXBfaW50ZXJ2YWwiOiAiNW0iCiAgImdyb3VwX3dhaXQiOiAiMzBzIgogICJyZWNlaXZlciI6ICJudWxsIgogICJyZXBlYXRfaW50ZXJ2YWwiOiAiMTJoIgogICJyb3V0ZXMiOgogIC0gIm1hdGNoIjoKICAgICAgImFsZXJ0bmFtZSI6ICJXYXRjaGRvZyIKICAgICJyZWNlaXZlciI6ICJudWxsIg==
kind: Secret kind: Secret
metadata: metadata:
name: alertmanager-main name: alertmanager-main