Skip to content

K8SPG-753: Add field to control pg_stat_statements #1114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hors merged 5 commits into from
Apr 4, 2025
Merged

K8SPG-753: Add field to control pg_stat_statements #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9032201
K8SPG-753: Add field to control pg_stat_statements
egegunes Mar 31, 2025
f99c270
fix monitoring test
egegunes Apr 2, 2025
bda643a
fix
egegunes Apr 2, 2025
a0e778b
fix
egegunes Apr 2, 2025
6fcbaf6
fix
egegunes Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8072,6 +8072,8 @@ spec:
type: boolean
pg_stat_monitor:
type: boolean
pg_stat_statements:
type: boolean
pgvector:
type: boolean
type: object
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8477,6 +8477,8 @@ spec:
type: boolean
pg_stat_monitor:
type: boolean
pg_stat_statements:
type: boolean
pgvector:
type: boolean
type: object
Expand Down
2 changes: 2 additions & 0 deletions deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8774,6 +8774,8 @@ spec:
type: boolean
pg_stat_monitor:
type: boolean
pg_stat_statements:
type: boolean
pgvector:
type: boolean
type: object
Expand Down
2 changes: 2 additions & 0 deletions deploy/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8774,6 +8774,8 @@ spec:
type: boolean
pg_stat_monitor:
type: boolean
pg_stat_statements:
type: boolean
pgvector:
type: boolean
type: object
Expand Down
2 changes: 2 additions & 0 deletions deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8774,6 +8774,8 @@ spec:
type: boolean
pg_stat_monitor:
type: boolean
pg_stat_statements:
type: boolean
pgvector:
type: boolean
type: object
Expand Down
14 changes: 11 additions & 3 deletions e2e-tests/tests/monitoring-pmm3/06-check-pgstatstatements-query-source.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 10 additions & 3 deletions e2e-tests/tests/monitoring/06-check-pgstatstatements-query-source.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 9 additions & 4 deletions pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/pgv2.percona.com/v2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading