K8SPG-982: set pg_stat_statements by default (#1527)

https://perconadev.atlassian.net/browse/K8SPG-982

Author: pooknull

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

@@ -22333,7 +22333,7 @@ spec:
                   postgresParams:
                     type: string
                   querySource:
-                    default: pgstatmonitor
+                    default: pgstatstatements
                     enum:
                     - pgstatmonitor
                     - pgstatstatements

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

@@ -23028,7 +23028,7 @@ spec:
                   postgresParams:
                     type: string
                   querySource:
-                    default: pgstatmonitor
+                    default: pgstatstatements
                     enum:
                     - pgstatmonitor
                     - pgstatstatements

deploy/bundle.yaml

@@ -23325,7 +23325,7 @@ spec:
                   postgresParams:
                     type: string
                   querySource:
-                    default: pgstatmonitor
+                    default: pgstatstatements
                     enum:
                     - pgstatmonitor
                     - pgstatstatements

deploy/crd.yaml

@@ -23325,7 +23325,7 @@ spec:
                   postgresParams:
                     type: string
                   querySource:
-                    default: pgstatmonitor
+                    default: pgstatstatements
                     enum:
                     - pgstatmonitor
                     - pgstatstatements

deploy/cw-bundle.yaml

@@ -23325,7 +23325,7 @@ spec:
                   postgresParams:
                     type: string
                   querySource:
-                    default: pgstatmonitor
+                    default: pgstatstatements
                     enum:
                     - pgstatmonitor
                     - pgstatstatements

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

@@ -7,16 +7,6 @@ commands:
 
       source ../../functions
 
-      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)
       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

e2e-tests/tests/monitoring-pmm3/07-enable-pgstatmonitor-query-source.yaml

@@ -0,0 +1,31 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring-pmm3 --type=merge -p '{
+        "spec":{
+          "pmm":{"querySource":"pgstatmonitor"}
+        }
+      }'
+
+      # Wait for the pg_stat_monitor extension to be created and PMM to switch query source.
+      sleep 80
+
+      primary=$(get_pod_by_role monitoring-pmm3 primary name)
+      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_monitor; then
+        echo "pg_stat_monitor is not found in pg_extension"
+        exit 1
+      fi
+
+      # Verify that the QAN agent is running with pgstatmonitor query source.
+      if ! kubectl -n ${NAMESPACE} exec ${primary} -c pmm-client -- pmm-admin list | grep postgresql_pgstatmonitor_agent; then
+        echo "postgresql_pgstatmonitor_agent is not running"
+        exit 1
+      fi
+    timeout: 360

…itoring-pmm3/07-check-password-leak.yaml …itoring-pmm3/08-check-password-leak.yamle2e-tests/tests/monitoring-pmm3/07-check-password-leak.yaml renamed to e2e-tests/tests/monitoring-pmm3/08-check-password-leak.yaml e2e-tests/tests/monitoring-pmm3/07-check-password-leak.yaml renamed to e2e-tests/tests/monitoring-pmm3/08-check-password-leak.yaml

@@ -7,16 +7,6 @@ commands:
 
       source ../../functions
 
-      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)
       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

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

@@ -0,0 +1,31 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring --type=merge -p '{
+        "spec":{
+          "pmm":{"querySource":"pgstatmonitor"}
+        }
+      }'
+
+      # Wait for the pg_stat_monitor extension to be created and PMM to switch query source.
+      sleep 80
+
+      primary=$(get_pod_by_role monitoring primary name)
+      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_monitor; then
+        echo "pg_stat_monitor is not found in pg_extension"
+        exit 1
+      fi
+
+      # Verify that the QAN agent is running with pgstatmonitor query source.
+      if ! kubectl -n ${NAMESPACE} exec ${primary} -c pmm-client -- pmm-admin list | grep postgresql_pgstatmonitor_agent; then
+        echo "postgresql_pgstatmonitor_agent is not running"
+        exit 1
+      fi
+    timeout: 360