From ec7cf624578b579419b20f67f28d8f04737362bf Mon Sep 17 00:00:00 2001
From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 16:05:58 +0200
Subject: [PATCH] feat(cluster): Extend monitoring options

Signed-off-by: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com>
---
 charts/cluster/templates/cluster.yaml         | 19 +++++++++++++
 charts/cluster/templates/pooler.yaml          | 12 +++++++++
 .../monitoring/01-monitoring_cluster.yaml     | 27 +++++++++++++++++++
 charts/cluster/values.schema.json             | 18 +++++++++++++
 charts/cluster/values.yaml                    | 22 ++++++++++++++-
 5 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
index 2dace8e343..fd3b358c62 100644
--- a/charts/cluster/templates/cluster.yaml
+++ b/charts/cluster/templates/cluster.yaml
@@ -69,10 +69,29 @@ spec:
 
   monitoring:
     enablePodMonitor: {{ and .Values.cluster.monitoring.enabled .Values.cluster.monitoring.podMonitor.enabled }}
+    disableDefaultQueries: {{ .Values.cluster.monitoring.disableDefaultQueries }}
     {{- if not (empty .Values.cluster.monitoring.customQueries) }}
     customQueriesConfigMap:
       - name: {{ include "cluster.fullname" . }}-monitoring
         key: custom-queries
     {{- end }}
+    {{- if not (empty .Values.cluster.monitoring.customQueriesSecret) }}
+    {{- with .Values.cluster.monitoring.customQueriesSecret }}
+    customQueriesSecret:
+      {{- toYaml . | nindent 6 }}
+    {{ end }}
+    {{- end }}
+    {{- if not (empty .Values.cluster.monitoring.podMonitor.relabelings) }}
+    {{- with .Values.cluster.monitoring.podMonitor.relabelings }}
+    podMonitorRelabelings:
+      {{- toYaml . | nindent 6 }}
+    {{ end }}
+    {{- end }}
+    {{- if not (empty .Values.cluster.monitoring.podMonitor.metricRelabelings) }}
+    {{- with .Values.cluster.monitoring.podMonitor.metricRelabelings }}
+    podMonitorMetricRelabelings:
+      {{- toYaml . | nindent 6 }}
+    {{ end }}
+    {{- end }}
   {{ include "cluster.bootstrap" . | nindent 2 }}
   {{ include "cluster.backup" . | nindent 2 }}
diff --git a/charts/cluster/templates/pooler.yaml b/charts/cluster/templates/pooler.yaml
index 5e01fe4988..e3c7e8402b 100644
--- a/charts/cluster/templates/pooler.yaml
+++ b/charts/cluster/templates/pooler.yaml
@@ -14,6 +14,18 @@ spec:
       {{- .Values.pooler.parameters | toYaml | nindent 6 }}
   monitoring:
     enablePodMonitor: {{ and .Values.pooler.monitoring.enabled .Values.pooler.monitoring.podMonitor.enabled }}
+    {{- if not (empty .Values.pooler.monitoring.podMonitor.relabelings) }}
+    {{- with .Values.pooler.monitoring.podMonitor.relabelings }}
+    podMonitorRelabelings:
+      {{- toYaml . | nindent 6 }}
+    {{ end }}
+    {{- end }}
+    {{- if not (empty .Values.pooler.monitoring.podMonitor.metricRelabelings) }}
+    {{- with .Values.pooler.monitoring.podMonitor.metricRelabelings }}
+    podMonitorMetricRelabelings:
+      {{- toYaml . | nindent 6 }}
+    {{ end }}
+    {{- end }}
   {{- with .Values.pooler.template }}
   template:
     {{- . | toYaml | nindent 4 }}
diff --git a/charts/cluster/test/monitoring/01-monitoring_cluster.yaml b/charts/cluster/test/monitoring/01-monitoring_cluster.yaml
index 62559eeaad..3a43e21ac8 100644
--- a/charts/cluster/test/monitoring/01-monitoring_cluster.yaml
+++ b/charts/cluster/test/monitoring/01-monitoring_cluster.yaml
@@ -6,6 +6,7 @@ cluster:
     storageClass: standard
   monitoring:
     enabled: true
+    disableDefaultQueries: true
     customQueries:
       - name: "pg_cache_hit_ratio"
         query: "SELECT current_database() as datname, sum(heap_blks_hit) / (sum(heap_blks_hit) + sum(heap_blks_read)) as ratio FROM pg_statio_user_tables;"
@@ -16,6 +17,19 @@ cluster:
           - ratio:
               usage: GAUGE
               description: "Cache hit ratio"
+    podMonitor:
+      relabelings:
+        - targetLabel: environment
+          replacement: test
+        - targetLabel: team
+          replacement: alpha
+      metricRelabelings:
+        - action: replace
+          sourceLabels:
+            - cluster
+          targetLabel: cnpg_cluster
+        - action: labeldrop
+          regex: cluster
 backups:
   enabled: false
 pooler:
@@ -23,3 +37,16 @@ pooler:
   instances: 1
   monitoring:
     enabled: true
+    podMonitor:
+      relabelings:
+        - targetLabel: environment
+          replacement: test
+        - targetLabel: team
+          replacement: alpha
+      metricRelabelings:
+        - action: replace
+          sourceLabels:
+            - cluster
+          targetLabel: cnpg_cluster
+        - action: labeldrop
+          regex: cluster
diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json
index a2354a8f8f..1a481e935c 100644
--- a/charts/cluster/values.schema.json
+++ b/charts/cluster/values.schema.json
@@ -208,6 +208,12 @@
                 "monitoring": {
                     "type": "object",
                     "properties": {
+                        "disableDefaultQueries": {
+                            "type": "boolean"
+                        },
+                        "customQueriesSecret": {
+                            "type": "array"
+                        },
                         "customQueries": {
                             "type": "array"
                         },
@@ -219,6 +225,12 @@
                             "properties": {
                                 "enabled": {
                                     "type": "boolean"
+                                },
+                                "relabelings": {
+                                    "type": "array"
+                                },
+                                "metricRelabelings": {
+                                    "type": "array"
                                 }
                             }
                         },
@@ -315,6 +327,12 @@
                             "properties": {
                                 "enabled": {
                                     "type": "boolean"
+                                },
+                                "relabelings": {
+                                    "type": "array"
+                                },
+                                "metricRelabelings": {
+                                    "type": "array"
                                 }
                             }
                         }
diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
index 7aa766d0fd..bc91809f2d 100644
--- a/charts/cluster/values.yaml
+++ b/charts/cluster/values.yaml
@@ -172,13 +172,23 @@ cluster:
     podMonitor:
       # -- Whether to enable the PodMonitor
       enabled: true
+      # --The list of relabelings for the PodMonitor.
+      # Applied to samples before scraping.
+      relabelings: []
+      # -- The list of metric relabelings for the PodMonitor.
+      # Applied to samples before ingestion.
+      metricRelabelings: []
     prometheusRule:
       # -- Whether to enable the PrometheusRule automated alerts
       enabled: true
       # -- Exclude specified rules
       excludeRules: []
         # - CNPGClusterZoneSpreadWarning
+    # -- Whether the default queries should be injected.
+    # Set it to true if you don't want to inject default queries into the cluster.
+    disableDefaultQueries: false
     # -- Custom Prometheus metrics
+    # Will be stored in the ConfigMap
     customQueries: []
     #  - name: "pg_cache_hit_ratio"
     #    query: "SELECT current_database() as datname, sum(heap_blks_hit) / (sum(heap_blks_hit) + sum(heap_blks_read)) as ratio FROM pg_statio_user_tables;"
@@ -189,6 +199,10 @@ cluster:
     #      - ratio:
     #          usage: GAUGE
     #          description: "Cache hit ratio"
+    # -- The list of secrets containing the custom queries
+    customQueriesSecret: []
+    #  - name: custom-queries-secret
+    #    key: custom-queries
 
   # -- Configuration of the PostgreSQL server.
   # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-PostgresConfiguration
@@ -305,8 +319,14 @@ pooler:
     # -- Whether to enable monitoring
     enabled: false
     podMonitor:
-        # -- Whether to enable the PodMonitor
+      # -- Whether to enable the PodMonitor
       enabled: true
+      # --The list of relabelings for the PodMonitor.
+      # Applied to samples before scraping.
+      relabelings: []
+      # -- The list of metric relabelings for the PodMonitor.
+      # Applied to samples before ingestion.
+      metricRelabelings: []
 
   # -- Custom PgBouncer deployment template.
   # Use to override image, specify resources, etc.