From 310f4e00f974ae8875c362254a78602b4799cabc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= <marcio.fernandes@outlook.pt>
Date: Wed, 15 Jul 2026 13:13:42 +0000
Subject: [PATCH] add fluxcd prometheus scrapping

---
 services/fluxcd-system/README.md              |  7 ++++++
 services/fluxcd-system/deploy/monitoring.yaml | 25 +++++++++++++++++++
 .../deploy/prometheus/prometheus-agent.yaml   |  9 +++++--
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 services/fluxcd-system/deploy/monitoring.yaml

diff --git a/services/fluxcd-system/README.md b/services/fluxcd-system/README.md
index 7546834..4e2585d 100644
--- a/services/fluxcd-system/README.md
+++ b/services/fluxcd-system/README.md
@@ -23,3 +23,10 @@ helm upgrade flux-operator oci://ghcr.io/controlplaneio-fluxcd/charts/flux-opera
   --create-namespace
   kubectl apply -f ./deploy/fluxsystem.yaml
 ```
+
+**Allow prometheus scrapping:**
+
+```bash
+kubectl apply -f deploy/monitoring
+kubectl label ns flux-system prometheus-monitoring=enabled
+```
diff --git a/services/fluxcd-system/deploy/monitoring.yaml b/services/fluxcd-system/deploy/monitoring.yaml
new file mode 100644
index 0000000..1e2a7b2
--- /dev/null
+++ b/services/fluxcd-system/deploy/monitoring.yaml
@@ -0,0 +1,25 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: flux-system
+  namespace: flux-system
+  labels:
+    app.kubernetes.io/part-of: flux
+    app.kubernetes.io/component: monitoring
+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:
+    - port: http-prom
\ No newline at end of file
diff --git a/services/monitoring/deploy/prometheus/prometheus-agent.yaml b/services/monitoring/deploy/prometheus/prometheus-agent.yaml
index 4ce07c2..09fd9d6 100644
--- a/services/monitoring/deploy/prometheus/prometheus-agent.yaml
+++ b/services/monitoring/deploy/prometheus/prometheus-agent.yaml
@@ -9,8 +9,13 @@ spec:
       prometheus-monitoring: enabled
 
   podMonitorSelector:
-    matchLabels:
-      release: prometheus
+    matchExpressions:
+      - key: release
+        operator: In
+        values: ["prometheus"]
+      - key: prometheus.io/scrape
+        operator: In
+        values: ["true"]
 
   serviceMonitorNamespaceSelector:
     matchLabels: