feat( cluster ): Advanced configuration for monitoring queries (#585)

Signed-off-by: Itay Grudev <[email protected]>

Author: itay-grudev

charts/cluster/templates/user-metrics.yaml

@@ -12,7 +12,13 @@ data:
     {{- range .Values.cluster.monitoring.customQueries }}
     {{ .name }}:
       query: {{ .query | quote }}
+      {{- with .target_databases }}
+      target_databases: {{ . | toJson }}
+      {{- end }}
+      {{- with .predicate_query }}
+      predicate_query: {{ tpl . $ | quote }}
+      {{- end }}
       metrics:
         {{- .metrics | toYaml | nindent 8 }}
     {{- end }}
-{{- end }}
+{{- end }}

charts/cluster/test/monitoring/01-monitoring_cluster-assert.yaml

@@ -124,6 +124,8 @@ data:
   custom-queries: |
     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;"
+      target_databases: ["*"]
+      predicate_query: "SELECT 'postgresql';"
       metrics:
         - datname:
             description: Name of the database

charts/cluster/test/monitoring/01-monitoring_cluster.yaml

@@ -11,6 +11,8 @@ cluster:
     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;"
+        target_databases: ["*"]
+        predicate_query: "SELECT '{{ .Values.type }}';"
         metrics:
           - datname:
               usage: "LABEL"
@@ -75,4 +77,4 @@ poolers:
               - cluster
             targetLabel: cnpg_cluster
           - action: labeldrop
-            regex: cluster
+            regex: cluster

charts/cluster/values.yaml

@@ -303,6 +303,8 @@ cluster:
     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;"
+    #    target_databases: ["*"]
+    #    predicate_query: "SELECT '{{ .Values.version.postgresql }}';"
     #    metrics:
     #      - datname:
     #          usage: "LABEL"