*: cleanup and unify minikube and self-hosted discovery

assets/prometheus/prometheus.yaml

@@ -53,15 +53,10 @@ scrape_configs:
   relabel_configs:
   - action: keep
     source_labels: [__meta_kubernetes_service_name]
-    regex: prometheus|kubernetes|node-exporter|kube-state-metrics|etcd-k8s
+    regex: prometheus|node-exporter|kube-state-metrics
   - action: replace
     source_labels: [__meta_kubernetes_service_name]
     target_label: job
-  - action: replace
-    source_labels: [__meta_kubernetes_service_name]
-    regex: kubernetes
-    target_label: __scheme__
-    replacement: https
 
 # Scrapes the endpoint lists for the kube-dns server. Which we consider
 # part of a default setup.
@@ -75,13 +70,16 @@ scrape_configs:
 
   relabel_configs:
   - action: replace
-    source_labels: [__meta_kubernetes_service_name]
+    source_labels: [__meta_kubernetes_service_label_k8s_app]
     target_label: job
-    regex: "kube-(.*)-prometheus-discovery"
-    replacement: "kube-${1}"
   - action: keep
     source_labels: [__meta_kubernetes_service_name]
-    regex: "kube-(.*)-prometheus-discovery"
+    regex: ".*-prometheus-discovery"
   - action: keep
     source_labels: [__meta_kubernetes_endpoint_port_name]
-    regex: "prometheus.*"
+    regex: "http-metrics.*|https-metrics.*"
+  - action: replace
+    source_labels: [__meta_kubernetes_endpoint_port_name]
+    regex: "https-metrics.*"
+    target_label: __scheme__
+    replacement: https