From dddcdb223a8deae5e386c9c95bb1b0391e4a2ef1 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Wed, 21 Nov 2018 16:25:48 +0100
Subject: [PATCH] kube-prometheus: Re-generate
---
jsonnetfile.lock.json | 4 ++--
manifests/prometheus-rules.yaml | 9 +++++++++
manifests/prometheus-serviceMonitorCoreDNS.yaml | 6 ++----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 4cab772d..3b9d80cd 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "f2724c252dad424580f3d5061304f88b4e1a2bb5"
+ "version": "dff8f44fbce268596c86b8d586c64c17953feab3"
},
{
"name": "ksonnet",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "bb25891960b9ebbe0f526d1e067f94906d6fb58f"
+ "version": "02a9810a9e4e5c95feed4a6d6d2c5525fe2af1c1"
}
]
}
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index ad3a6065..a7987abc 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -293,6 +293,15 @@ spec:
for: 15m
labels:
severity: critical
+ - alert: CoreDNSDown
+ annotations:
+ message: CoreDNS has disappeared from Prometheus target discovery.
+ runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-corednsdown
+ expr: |
+ absent(up{job="kube-dns"} == 1)
+ for: 15m
+ labels:
+ severity: critical
- alert: KubeAPIDown
annotations:
message: KubeAPI has disappeared from Prometheus target discovery.
diff --git a/manifests/prometheus-serviceMonitorCoreDNS.yaml b/manifests/prometheus-serviceMonitorCoreDNS.yaml
index 12a4c5bf..14a24545 100644
--- a/manifests/prometheus-serviceMonitorCoreDNS.yaml
+++ b/manifests/prometheus-serviceMonitorCoreDNS.yaml
@@ -9,12 +9,10 @@ spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 15s
- port: http-metrics
- jobLabel: k8s-app
+ port: metrics
namespaceSelector:
matchNames:
- kube-system
selector:
matchLabels:
- component: metrics
- k8s-app: coredns
+ k8s-app: kube-dns
--
GitLab