kube-prometheus: simplify service monitors

2017-05-30 16:48:52 -07:00
parent c4b382be6f
commit 3aeca3de7b
9 changed files with 63 additions and 46 deletions
--- a/manifests/prometheus/prometheus-k8s-service-monitor-kubelet.yaml
+++ b/manifests/prometheus/prometheus-k8s-service-monitor-kubelet.yaml
@@ -3,16 +3,16 @@ kind: ServiceMonitor
 metadata:
  name: kubelet
  labels:
-    k8s-apps: http
+    k8s-app: kubelet
 spec:
  jobLabel: k8s-app
+  endpoints:
+  - port: http-metrics
+    interval: 30s
+    honorLabels: true
  selector:
    matchLabels:
      k8s-app: kubelet
  namespaceSelector:
    matchNames:
    - kube-system
-  endpoints:
-  - port: http-metrics
-    interval: 15s
-    honorLabels: true