Skip to content

Commit 5fabdd8

Browse files
pooknullhors
pooknull
and
hors
authored
K8SPG-982: disable pg_stat_monitor by default (#1512)
* K8SPG-982: disable `pg_stat_monitor` by default https://perconadev.atlassian.net/browse/K8SPG-982 * fix `builtin-extensions` e2e test * update `builtin-extensions` test * update pmm check * fix `builtin-extensions` test * fix `custom-extensions` test --------- Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
1 parent d40d567 commit 5fabdd8

18 files changed

+287
-32
lines changed

‎deploy/cr.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ spec:
767767
# secret:
768768
# name: cluster1-extensions-secret
769769
# builtin:
770-
# pg_stat_monitor: true
770+
# pg_stat_monitor: false
771771
# pg_stat_statements: false
772772
# pg_audit: true
773773
# pgvector: false

‎e2e-tests/tests/builtin-extensions/02-assert.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ metadata:
88
name: 02-check-extensions
99
data:
1010
data: |2-
11-
pg_stat_monitor
1211
pgaudit
1312
plpgsql

‎e2e-tests/tests/builtin-extensions/03-install-all-ext.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spec:
1212
logging_collector: 'off'
1313
extensions:
1414
builtin:
15-
pg_stat_monitor: true
15+
pg_stat_monitor: false # you can't enable both pg_stat_statements and pg_stat_monitor
1616
pg_stat_statements: true
1717
pg_audit: true
1818
pgvector: true

‎e2e-tests/tests/builtin-extensions/04-assert.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ metadata:
99
data:
1010
data: |2-
1111
pg_repack
12-
pg_stat_monitor
1312
pg_stat_statements
1413
pgaudit
1514
plpgsql

‎e2e-tests/tests/builtin-extensions/05-check-ext-funcs.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ commands:
99
1010
sleep 30
1111
12-
# pg_stat_monitor
13-
run_psql_local \
14-
"SELECT pg_stat_monitor_reset();" \
15-
"postgres:$(get_psql_user_pass builtin-extensions-pguser-postgres)@$(get_psql_user_host builtin-extensions-pguser-postgres)/postgres"
16-
1712
# pg_stat_statements
1813
run_psql_local \
1914
"SELECT pg_stat_statements_reset();" \

‎e2e-tests/tests/builtin-extensions/06-enable-pgstatmonitor.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: pgv2.percona.com/v2
2+
kind: PerconaPGCluster
3+
metadata:
4+
name: builtin-extensions
5+
spec:
6+
patroni:
7+
dynamicConfiguration:
8+
postgresql:
9+
parameters:
10+
pgaudit.log: 'ddl,write,role'
11+
pgaudit.log_level: 'warning'
12+
logging_collector: 'off'
13+
extensions:
14+
builtin:
15+
pg_stat_monitor: true
16+
pg_stat_statements: false # you can't enable both pg_stat_statements and pg_stat_monitor
17+
pg_audit: true
18+
pgvector: true
19+
pg_repack: true

‎e2e-tests/tests/builtin-extensions/07-assert.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ timeout: 30
55
kind: ConfigMap
66
apiVersion: v1
77
metadata:
8-
name: 06-check-extensions
8+
name: 07-check-extensions
99
data:
1010
data: |2-
11+
pg_repack
12+
pg_stat_monitor
13+
pgaudit
1114
plpgsql
15+
vector

‎e2e-tests/tests/builtin-extensions/07-check-extensions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ commands:
1010
1111
data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass builtin-extensions-pguser-postgres)@$(get_psql_user_host builtin-extensions-pguser-postgres) -c "\c postgres" -c "SELECT extname FROM pg_extension ORDER BY extname")
1212
13-
kubectl create configmap -n "${NAMESPACE}" 06-check-extensions --from-literal=data="${data}"
13+
kubectl create configmap -n "${NAMESPACE}" 07-check-extensions --from-literal=data="${data}"

‎e2e-tests/tests/builtin-extensions/08-check-pgstatmonitor.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
commands:
4+
- script: |-
5+
set -o errexit
6+
set -o xtrace
7+
8+
source ../../functions
9+
10+
sleep 30
11+
12+
# pg_stat_monitor
13+
run_psql_local \
14+
"SELECT pg_stat_monitor_reset();" \
15+
"postgres:$(get_psql_user_pass builtin-extensions-pguser-postgres)@$(get_psql_user_host builtin-extensions-pguser-postgres)/postgres"
16+
17+
timeout: 360
18+

‎e2e-tests/tests/builtin-extensions/09-assert.yaml‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestAssert
3+
timeout: 180
4+
---
5+
kind: StatefulSet
6+
apiVersion: apps/v1
7+
metadata:
8+
name: builtin-extensions-repo-host
9+
labels:
10+
postgres-operator.crunchydata.com/cluster: builtin-extensions
11+
postgres-operator.crunchydata.com/data: pgbackrest
12+
postgres-operator.crunchydata.com/pgbackrest: ''
13+
postgres-operator.crunchydata.com/pgbackrest-dedicated: ''
14+
ownerReferences:
15+
- apiVersion: postgres-operator.crunchydata.com/v1beta1
16+
kind: PostgresCluster
17+
name: builtin-extensions
18+
controller: true
19+
blockOwnerDeletion: true
20+
status:
21+
observedGeneration: 1
22+
replicas: 1
23+
readyReplicas: 1
24+
currentReplicas: 1
25+
updatedReplicas: 1
26+
collisionCount: 0
27+
---
28+
kind: StatefulSet
29+
apiVersion: apps/v1
30+
metadata:
31+
labels:
32+
postgres-operator.crunchydata.com/cluster: builtin-extensions
33+
postgres-operator.crunchydata.com/data: postgres
34+
postgres-operator.crunchydata.com/instance-set: instance1
35+
ownerReferences:
36+
- apiVersion: postgres-operator.crunchydata.com/v1beta1
37+
kind: PostgresCluster
38+
name: builtin-extensions
39+
controller: true
40+
blockOwnerDeletion: true
41+
status:
42+
observedGeneration: 1
43+
replicas: 1
44+
readyReplicas: 1
45+
currentReplicas: 1
46+
updatedReplicas: 1
47+
collisionCount: 0
48+
---
49+
kind: Deployment
50+
apiVersion: apps/v1
51+
metadata:
52+
name: builtin-extensions-pgbouncer
53+
labels:
54+
postgres-operator.crunchydata.com/cluster: builtin-extensions
55+
postgres-operator.crunchydata.com/role: pgbouncer
56+
annotations:
57+
deployment.kubernetes.io/revision: '1'
58+
ownerReferences:
59+
- apiVersion: postgres-operator.crunchydata.com/v1beta1
60+
kind: PostgresCluster
61+
name: builtin-extensions
62+
controller: true
63+
blockOwnerDeletion: true
64+
status:
65+
observedGeneration: 1
66+
replicas: 3
67+
updatedReplicas: 3
68+
readyReplicas: 3
69+
---
70+
kind: Job
71+
apiVersion: batch/v1
72+
metadata:
73+
labels:
74+
postgres-operator.crunchydata.com/cluster: builtin-extensions
75+
postgres-operator.crunchydata.com/pgbackrest: ''
76+
postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
77+
postgres-operator.crunchydata.com/pgbackrest-repo: repo1
78+
ownerReferences:
79+
- apiVersion: pgv2.percona.com/v2
80+
kind: PerconaPGBackup
81+
controller: true
82+
blockOwnerDeletion: true
83+
status:
84+
succeeded: 1
85+
---
86+
apiVersion: postgres-operator.crunchydata.com/v1beta1
87+
kind: PostgresCluster
88+
metadata:
89+
name: builtin-extensions
90+
ownerReferences:
91+
- apiVersion: pgv2.percona.com/v2
92+
kind: PerconaPGCluster
93+
name: builtin-extensions
94+
controller: true
95+
blockOwnerDeletion: true
96+
finalizers:
97+
- postgres-operator.crunchydata.com/finalizer
98+
status:
99+
instances:
100+
- name: instance1
101+
readyReplicas: 3
102+
replicas: 3
103+
updatedReplicas: 3
104+
observedGeneration: 4
105+
pgbackrest:
106+
repoHost:
107+
apiVersion: apps/v1
108+
kind: StatefulSet
109+
ready: true
110+
repos:
111+
- bound: true
112+
name: repo1
113+
replicaCreateBackupComplete: true
114+
stanzaCreated: true
115+
proxy:
116+
pgBouncer:
117+
readyReplicas: 3
118+
replicas: 3
119+
---
120+
apiVersion: pgv2.percona.com/v2
121+
kind: PerconaPGCluster
122+
metadata:
123+
name: builtin-extensions
124+
status:
125+
pgbouncer:
126+
ready: 3
127+
size: 3
128+
postgres:
129+
instances:
130+
- name: instance1
131+
ready: 3
132+
size: 3
133+
ready: 3
134+
size: 3
135+
state: ready

0 commit comments

Comments
 (0)