Add roadmap, fix manifests, improve hack scripts

2016-10-24 11:55:51 +02:00
parent 79ed777dea
commit 7b92c0289a
11 changed files with 46 additions and 36 deletions
--- a/manifests/prometheus/prometheus-k8s-cm.yaml
+++ b/manifests/prometheus/prometheus-k8s-cm.yaml
@@ -7,10 +7,6 @@ data:
    global:
      evaluation_interval: 30s

-    # Add your etcd scrape config here. We cannot default here as etcd is a
-    # prerequisite for Kubernetes.
-    # TODO(fabxc): potentially make this configurable via KPM in the future.
-
    scrape_configs:
    - job_name: kubelets
      scrape_interval: 20s
--- a/manifests/prometheus/prometheus-k8s-svc.yaml
+++ b/manifests/prometheus/prometheus-k8s-svc.yaml
@@ -11,4 +11,5 @@ spec:
    protocol: TCP
    targetPort: web
  selector:
-    prometheus.coreos.com: prometheus-k8s
+    prometheus.coreos.com/type: prometheus
+    prometheus.coreos.com/name: prometheus-k8s