From b99df46cbfeddd8504340b789864be7d1ffd8d56 Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Fri, 11 Apr 2025 12:36:36 +0200
Subject: [PATCH] feat(mycloud-services): enable monitoring

---
 mycloud-services/README.md                    |  9 ++++++++
 .../templates/postgresql/release.yaml         | 21 +++++++++++++++++--
 .../templates/postgresql/secrets.yaml         |  2 +-
 mycloud-services/values.yaml                  | 19 +++++++++++++++++
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/mycloud-services/README.md b/mycloud-services/README.md
index e8c29ad..1eedcd2 100644
--- a/mycloud-services/README.md
+++ b/mycloud-services/README.md
@@ -19,6 +19,15 @@ A Helm chart for Kubernetes
 
 ## Values
 
+### Commons Monitoring
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| commons.grafana.dashboards.annotations | object | `{}` | annotations of grafana dashboard configmap |
+| commons.grafana.dashboards.labels | object | `{}` | labels of grafana dashboard configmap |
+| commons.prometheus.monitor.labels | object | `{}` | labels on Pod- and Service-Monitor |
+| commons.prometheus.rules.labels | object | `{}` | labels on PrometheusRules |
+
 ### Commons helm release
 
 | Key | Type | Default | Description |
diff --git a/mycloud-services/templates/postgresql/release.yaml b/mycloud-services/templates/postgresql/release.yaml
index 353256b..72a1bff 100644
--- a/mycloud-services/templates/postgresql/release.yaml
+++ b/mycloud-services/templates/postgresql/release.yaml
@@ -7,7 +7,7 @@ spec:
   url: oci://codeberg.org/wrenix/helm-charts/postgresql
   interval: 10m
   ref:
-    semver: "^0.2.6"
+    semver: "^0.3.0"
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -28,7 +28,7 @@ spec:
   interval: 10m
   valuesFrom:
     - kind: Secret
-      name: mycloud-services-postgresql
+      name: {{.Release.Name }}-pgsql
   values:
     persistence:
       size: {{ .Values.postgresql.persistence.size }}
@@ -53,3 +53,20 @@ spec:
           {{- end }}
         {{- end }}
         {{- end }}
+    prometheus:
+      enabled: {{ (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor") }}
+      servicemonitor:
+        enabled: {{ (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor") }}
+        labels:
+          {{- toYaml .Values.commons.prometheus.monitor.labels | nindent 10 }}
+      rules:
+        enabled: {{ (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/PrometheusRule") }}
+        labels:
+          {{- toYaml .Values.commons.prometheus.rules.labels | nindent 10 }}
+    grafana:
+      dashboards:
+        enabled: true
+        labels:
+          {{- toYaml .Values.commons.grafana.dashboards.labels | nindent 10 }}
+        annotations:
+          {{- toYaml .Values.commons.grafana.dashboards.annotations | nindent 10 }}
diff --git a/mycloud-services/templates/postgresql/secrets.yaml b/mycloud-services/templates/postgresql/secrets.yaml
index c6678d2..cddf9b4 100644
--- a/mycloud-services/templates/postgresql/secrets.yaml
+++ b/mycloud-services/templates/postgresql/secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: mycloud-services-postgresql
+  name: {{.Release.Name }}-pgsql
 stringData:
   values.yaml: |
     job:
diff --git a/mycloud-services/values.yaml b/mycloud-services/values.yaml
index 9005baa..144fdff 100644
--- a/mycloud-services/values.yaml
+++ b/mycloud-services/values.yaml
@@ -30,6 +30,25 @@ commons:
       # @section -- Commons helm release
       driftDetection: {}
 
+  prometheus:
+    monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
+      labels: {}
+    rules:
+      # -- labels on PrometheusRules
+      # @section -- Commons Monitoring
+      labels: {}
+
+  grafana:
+    dashboards:
+      # -- labels of grafana dashboard configmap
+      # @section -- Commons Monitoring
+      labels: {}
+      # -- annotations of grafana dashboard configmap
+      # @section -- Commons Monitoring
+      annotations: {}
+
 postgresql:
   persistence:
     storageClass: