Add customQueriesSecret

charts/cluster/templates/cluster.yaml

@@ -75,6 +75,12 @@ spec:
       - 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:

charts/cluster/values.schema.json

@@ -211,6 +211,9 @@
                         "disableDefaultQueries": {
                             "type": "boolean"
                         },
+                        "customQueriesSecret": {
+                            "type": "array"
+                        },
                         "customQueries": {
                             "type": "array"
                         },

charts/cluster/values.yaml

@@ -188,6 +188,7 @@ cluster:
     # 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;"
@@ -198,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