use ServiceMonitors to generate Prometheus Kubernetes config

manifests/exporters/kube-state-metrics-depl.yaml

@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: kube-state-metrics
-        image: gcr.io/google_containers/kube-state-metrics:v0.3.0
+        image: gcr.io/google_containers/kube-state-metrics:v0.4.1
         ports:
         - name: metrics
           containerPort: 8080

manifests/exporters/kube-state-metrics-svc.yaml

@@ -3,10 +3,13 @@ kind: Service
 metadata:
   labels:
     app: kube-state-metrics
+    k8s-app: kube-state-metrics
+  annotations:
+    alpha.monitoring.coreos.com/non-namespaced: "true"
   name: kube-state-metrics
 spec:
   ports:
-  - name: metrics 
+  - name: http-metrics
     port: 8080
     targetPort: metrics
     protocol: TCP

manifests/exporters/node-exporter-svc.yaml

@@ -3,12 +3,13 @@ kind: Service
 metadata:
   labels:
     app: node-exporter
+    k8s-app: node-exporter
   name: node-exporter
 spec:
   type: ClusterIP
   clusterIP: None
   ports:
-  - name: metrics
+  - name: http-metrics
     port: 9100
     protocol: TCP
   selector: