Revert "fix prometheus"

This reverts commit a3d3dd8336.

deploy/prometheus/deploy.jsonnet

@@ -9,7 +9,7 @@ local kp = (import 'kube-prometheus/main.libsonnet') + {
   // Disable the built-in Grafana component
   grafana+:: {},
 
-  // Prometheus customizations: external URL, persistent storage, and self-scrape enabled
+  // Prometheus customizations: external URL and persistent storage
   prometheus+:: {
     prometheus+: {
       spec+: {
@@ -24,22 +24,6 @@ local kp = (import 'kube-prometheus/main.libsonnet') + {
             },
           },
         },
-        // Enable self-scraping so Prometheus will automatically scrape its own /metrics endpoint
-        selfScrape: true,
-        // Set a ServiceMonitor selector that matches the Prometheus service's labels
-        serviceMonitorSelector: {
-          matchLabels: {
-            "k8s-app": "prometheus",
-          },
-        },
-      },
-    },
-    // Ensure the Prometheus service gets the label so that the selector above matches it
-    service+: {
-      metadata+: {
-        labels: {
-          "k8s-app": "prometheus",
-        },
       },
     },
   },
@@ -143,4 +127,4 @@ local kp = (import 'kube-prometheus/main.libsonnet') + {
 { ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } +
 { ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } +
 { ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } +
-{ [name + '-ingress']: kp.ingress[name] for name in std.objectFields(kp.ingress) }
+{ [name + '-ingress']: kp.ingress[name] for name in std.objectFields(kp.ingress) }

deploy/prometheus/manifests/prometheus-networkPolicy.yaml

@@ -2,7 +2,11 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   labels:
-    k8s-app: prometheus
+    app.kubernetes.io/component: prometheus
+    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 3.2.1
   name: prometheus-k8s
   namespace: monitoring
 spec:

deploy/prometheus/manifests/prometheus-prometheus.yaml

@@ -46,12 +46,9 @@ spec:
     fsGroup: 2000
     runAsNonRoot: true
     runAsUser: 1000
-  selfScrape: true
   serviceAccountName: prometheus-k8s
   serviceMonitorNamespaceSelector: {}
-  serviceMonitorSelector:
-    matchLabels:
-      k8s-app: prometheus
+  serviceMonitorSelector: {}
   storage:
     volumeClaimTemplate:
       spec:

deploy/prometheus/manifests/prometheus-service.yaml

@@ -2,7 +2,11 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    k8s-app: prometheus
+    app.kubernetes.io/component: prometheus
+    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 3.2.1
   name: prometheus-k8s
   namespace: monitoring
 spec: