From 01d30382aa5e5006473019aed36838758b13f231 Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Tue, 29 Oct 2019 14:27:39 +0100 Subject: [PATCH 1/2] jsonnet/kube-prometheus/alerts: Add namespace to TargetDown msg --- jsonnet/kube-prometheus/alerts/general.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/alerts/general.libsonnet b/jsonnet/kube-prometheus/alerts/general.libsonnet index 79eba7d9..441ec777 100644 --- a/jsonnet/kube-prometheus/alerts/general.libsonnet +++ b/jsonnet/kube-prometheus/alerts/general.libsonnet @@ -7,7 +7,7 @@ { alert: 'TargetDown', annotations: { - message: '{{ printf "%.4g" $value }}% of the {{ $labels.job }} targets are down.', + message: '{{ printf "%.4g" $value }}% of the {{ $labels.job }} targets in {{ $labels.namespace }} namespace are down.', }, expr: '100 * (count(up == 0) BY (job, namespace, service) / count(up) BY (job, namespace, service)) > 10', 'for': '10m', From 78b9183837bc59ed34532a415a6c404181334a5e Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Tue, 29 Oct 2019 14:59:13 +0100 Subject: [PATCH 2/2] manifests/prometheus-rules.yaml: Regenerate file --- manifests/prometheus-rules.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml index 769e6559..e258b84b 100644 --- a/manifests/prometheus-rules.yaml +++ b/manifests/prometheus-rules.yaml @@ -1148,8 +1148,8 @@ spec: rules: - alert: TargetDown annotations: - message: '{{ printf "%.4g" $value }}% of the {{ $labels.job }} targets are - down.' + message: '{{ printf "%.4g" $value }}% of the {{ $labels.job }} targets in + {{ $labels.namespace }} namespace are down.' expr: 100 * (count(up == 0) BY (job, namespace, service) / count(up) BY (job, namespace, service)) > 10 for: 10m