diff --git a/assets/prometheus/prometheus.yaml b/assets/prometheus/prometheus.yaml index ea10a6081d9693a0b39b97dc6b985ef0e26ef583..d48d56483973dc1eef38f90abc80a7848f33bff7 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 0000000000000000000000000000000000000000..4ae570f8b689f339a8287468cb5cd014dd1e7bd4 --- /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 59c6389be89ecdc02e628aac0134f13e0500d2cf..a8846b92b800d00021634bc5d82fbcd11fac8af3 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