fix(prometheus): servicemonitor labels

flux-config/base/prometheus/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: flux-system
+
+resources:
+  - podmonitor.yaml

flux-config/base/prometheus/podmonitor.yaml

@@ -0,0 +1,24 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: flux-system
+  namespace: flux-system
+  labels:
+    prometheus-instance: "main"
+spec:
+  namespaceSelector:
+    matchNames:
+      - flux-system
+  selector:
+    matchExpressions:
+      - key: app
+        operator: In
+        values:
+          - helm-controller
+          - source-controller
+          - kustomize-controller
+          - notification-controller
+          - image-automation-controller
+          - image-reflector-controller
+  podMetricsEndpoints:
+    - targetPort: http-prom

flux-config/mycluster-0/weave-gitops/kustomization.yaml

@@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - ../../base/prometheus
   - ../../base/weave-gitops

observability/base/kube-prometheus-stack/release.yaml

@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: prometheus-community
         namespace: flux-system
-      version: "50.0.0"
+      version: "50.3.1"
   interval: 10m0s
   timeout: 30m
   install:
@@ -30,6 +30,9 @@ spec:
     alertmanager:
       enabled: false
     grafana:
+      serviceMonitor:
+        labels:
+          prometheus-instance: main
       admin:
         existingSecret: "kube-prometheus-stack-grafana-admin"
       defaultDashboardsEnabled: true
@@ -101,7 +104,6 @@ spec:
         requests:
           cpu: 100m
           memory: 400Mi
-
     prometheus:
       configReloaderCpu: 300m
       prometheusSpec:
@@ -127,3 +129,7 @@ spec:
           limits:
             cpu: 500m
             memory: 1Gi
+    kubelet:
+      servicemonitor:
+        additionalLabels:
+          prometheus-instance: main