From a40ca507c6f67a13fff7699b3cf679a0c960fe58 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Fri, 2 Dec 2016 14:01:02 +0100
Subject: [PATCH] manifests/k8s: add service for discovering kube-dns metrics
The ports reflect the upstream kube-dns manifests of bootkube and
kubernetes/kubernetes.
---
assets/prometheus/prometheus.yaml | 2 +-
.../k8s/kube-dns-bootkube-vagrant-multi.yaml | 20 +++++++++++++++++++
manifests/prometheus/prometheus-k8s-cm.yaml | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 manifests/k8s/kube-dns-bootkube-vagrant-multi.yaml
diff --git a/assets/prometheus/prometheus.yaml b/assets/prometheus/prometheus.yaml
index ea10a608..d48d5648 100644
--- a/assets/prometheus/prometheus.yaml
+++ b/assets/prometheus/prometheus.yaml
@@ -65,4 +65,4 @@ scrape_configs:
regex: "kube-(.*)-prometheus-discovery"
- action: keep
source_labels: [__meta_kubernetes_endpoint_port_name]
- regex: "prometheus"
+ regex: "prometheus.*"
diff --git a/manifests/k8s/kube-dns-bootkube-vagrant-multi.yaml b/manifests/k8s/kube-dns-bootkube-vagrant-multi.yaml
new file mode 100644
index 00000000..4ae570f8
--- /dev/null
+++ b/manifests/k8s/kube-dns-bootkube-vagrant-multi.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: kube-dns-prometheus-discovery
+ labels:
+ k8s-app: kube-dns
+spec:
+ selector:
+ k8s-app: kube-dns
+ type: ClusterIP
+ clusterIP: None
+ ports:
+ - name: prometheus-skydns
+ port: 10055
+ targetPort: 10055
+ protocol: TCP
+ - name: prometheus-dnsmasq
+ port: 10054
+ targetPort: 10054
+ protocol: TCP
diff --git a/manifests/prometheus/prometheus-k8s-cm.yaml b/manifests/prometheus/prometheus-k8s-cm.yaml
index 59c6389b..a8846b92 100644
--- a/manifests/prometheus/prometheus-k8s-cm.yaml
+++ b/manifests/prometheus/prometheus-k8s-cm.yaml
@@ -68,7 +68,7 @@ data:
regex: "kube-(.*)-prometheus-discovery"
- action: keep
source_labels: [__meta_kubernetes_endpoint_port_name]
- regex: "prometheus"
+ regex: "prometheus.*"
kind: ConfigMap
metadata:
creationTimestamp: null
--
GitLab