K8SPG-753: Add field to control pg_stat_statements (#1114)

* K8SPG-753: Add field to control pg_stat_statements

* fix monitoring test

* fix

* fix

* fix

Author: egegunes

build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml

@@ -8072,6 +8072,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object

config/crd/bases/pgv2.percona.com_perconapgclusters.yaml

@@ -8477,6 +8477,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object

deploy/bundle.yaml

@@ -8774,6 +8774,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object

deploy/crd.yaml

@@ -8774,6 +8774,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object

deploy/cw-bundle.yaml

@@ -8774,6 +8774,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object

e2e-tests/tests/monitoring-pmm3/06-check-pgstatstatements-query-source.yaml

@@ -7,11 +7,19 @@ commands:
 
       source ../../functions
 
-      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring-pmm3 --type=merge -p '{"spec":{"pmm":{"querySource":"pgstatstatements"}}}'
+      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring-pmm3 --type=merge -p '{
+        "spec":{
+          "pmm":{"querySource":"pgstatstatements"},
+          "extensions": {"builtin": {"pg_stat_statements": true }}}
+        }
+      '
 
       # Wait for the pg_stat_statements extension to be created
       sleep 80
 
       primary=$(get_pod_by_role monitoring-pmm3 primary name)
-      res=$(kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"')
-      echo ${res} | grep -q pg_stat_statements
+      kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT * FROM pg_extension;"'
+      if ! kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"' | grep pg_stat_statements; then
+        echo "pg_stat_statements is not found in pg_extension"
+      fi
+    timeout: 360

e2e-tests/tests/monitoring/06-check-pgstatstatements-query-source.yaml

@@ -7,12 +7,19 @@ commands:
 
       source ../../functions
 
-      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring --type=merge -p '{"spec":{"pmm":{"querySource":"pgstatstatements"}}}'
+      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring --type=merge -p '{
+        "spec":{
+          "pmm":{"querySource":"pgstatstatements"},
+          "extensions": {"builtin": {"pg_stat_statements": true }}}
+        }
+      '
 
       # Wait for the pg_stat_statements extension to be created
       sleep 80
 
       primary=$(get_pod_by_role monitoring primary name)
-      res=$(kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"')
-      echo ${res} | grep -q pg_stat_statements
+      kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT * FROM pg_extension;"'
+      if ! kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"' | grep pg_stat_statements; then
+        echo "pg_stat_statements is not found in pg_extension"
+      fi
     timeout: 360

pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go

@@ -225,6 +225,9 @@ func (cr *PerconaPGCluster) Default() {
 	if cr.Spec.Extensions.BuiltIn.PGStatMonitor == nil {
 		cr.Spec.Extensions.BuiltIn.PGStatMonitor = &t
 	}
+	if cr.Spec.Extensions.BuiltIn.PGStatStatements == nil {
+		cr.Spec.Extensions.BuiltIn.PGStatStatements = &f
+	}
 	if cr.Spec.Extensions.BuiltIn.PGAudit == nil {
 		cr.Spec.Extensions.BuiltIn.PGAudit = &t
 	}
@@ -355,6 +358,7 @@ func (cr *PerconaPGCluster) ToCrunchy(ctx context.Context, postgresCluster *crun
 	postgresCluster.Spec.Proxy = cr.Spec.Proxy.ToCrunchy()
 
 	postgresCluster.Spec.Extensions.PGStatMonitor = *cr.Spec.Extensions.BuiltIn.PGStatMonitor
+	postgresCluster.Spec.Extensions.PGStatStatements = *cr.Spec.Extensions.BuiltIn.PGStatStatements
 	postgresCluster.Spec.Extensions.PGAudit = *cr.Spec.Extensions.BuiltIn.PGAudit
 	postgresCluster.Spec.Extensions.PGVector = *cr.Spec.Extensions.BuiltIn.PGVector
 	postgresCluster.Spec.Extensions.PGRepack = *cr.Spec.Extensions.BuiltIn.PGRepack
@@ -605,10 +609,11 @@ type CustomExtensionsStorageSpec struct {
 }
 
 type BuiltInExtensionsSpec struct {
-	PGStatMonitor *bool `json:"pg_stat_monitor,omitempty"`
-	PGAudit       *bool `json:"pg_audit,omitempty"`
-	PGVector      *bool `json:"pgvector,omitempty"`
-	PGRepack      *bool `json:"pg_repack,omitempty"`
+	PGStatMonitor    *bool `json:"pg_stat_monitor,omitempty"`
+	PGStatStatements *bool `json:"pg_stat_statements,omitempty"`
+	PGAudit          *bool `json:"pg_audit,omitempty"`
+	PGVector         *bool `json:"pgvector,omitempty"`
+	PGRepack         *bool `json:"pg_repack,omitempty"`
 }
 
 type ExtensionsSpec struct {