From fcbf0269ea9ec9419238b43b5d101978e309c420 Mon Sep 17 00:00:00 2001
From: Oscar Boher <oscar@cala.ai>
Date: Fri, 28 Aug 2026 18:04:16 +0200
Subject: [PATCH] cnpg: attach customQueriesConfigMap for instrumentations

---
 charts/cluster/templates/cluster.yaml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
index ecf04b6de2..53732f610b 100644
--- a/charts/cluster/templates/cluster.yaml
+++ b/charts/cluster/templates/cluster.yaml
@@ -140,11 +140,20 @@ spec:
 
   monitoring:
     disableDefaultQueries: {{ .Values.cluster.monitoring.disableDefaultQueries }}
-    {{- if not (empty .Values.cluster.monitoring.customQueries) }}
+    {{- if or (not (empty .Values.cluster.monitoring.customQueries)) (or .Values.cluster.monitoring.instrumentation.pgStatStatements .Values.cluster.monitoring.instrumentation.logicalReplication) }}
     customQueriesConfigMap:
+    {{- if not (empty .Values.cluster.monitoring.customQueries) }}
       - name: {{ include "cluster.fullname" . }}-monitoring
         key: custom-queries
     {{- end }}
+    {{- if not (not .Values.cluster.monitoring.instrumentation.pgStatStatements) }}
+      - name: {{ include "cluster.fullname" . }}-monitoring-pg-stat-statements
+        key: custom-queries
+    {{- end }}
+    {{- if .Values.cluster.monitoring.instrumentation.logicalReplication }}
+    - name: {{ include "cluster.fullname" . }}-monitoring-logical-replication
+      key: custom-queries
+    {{- end }}
     {{- if not (empty .Values.cluster.monitoring.customQueriesSecret) }}
     {{- with .Values.cluster.monitoring.customQueriesSecret }}
     customQueriesSecret: