diff --git a/charts/pg-db/README.md b/charts/pg-db/README.md index 0927b772..cd6ca041 100644 --- a/charts/pg-db/README.md +++ b/charts/pg-db/README.md @@ -199,6 +199,7 @@ The chart can be customized using the following configurable parameters: | `pmm.image.repository` | PMM Container image repository | `percona/pmm-client` | | `pmm.image.tag` | PMM Container image tag | `2.42.0` | | `pmm.serverHost` | PMM server related K8S service hostname | `monitoring-service` | +| `pmm.querySource` | PMM querySource, 'pgstatmonitor' or 'pgstatstatemenets'. | `pgstatmonitor` | | `pmm.resources.requests.memory` | Container resource request for RAM | `200M` | | `pmm.resources.requests.cpu` | Container resource request for CPU | `500m` | | | diff --git a/charts/pg-db/templates/cluster.yaml b/charts/pg-db/templates/cluster.yaml index 1308291b..4760e2d4 100644 --- a/charts/pg-db/templates/cluster.yaml +++ b/charts/pg-db/templates/cluster.yaml @@ -368,6 +368,7 @@ spec: image: {{ .Values.pmm.image.repository }}:{{ .Values.pmm.image.tag }} serverHost: {{ .Values.pmm.serverHost }} secret: {{ include "pg-database.fullname" . }}-pmm-secret + querySource: {{ .Values.pmm.querySource }} backups: trackLatestRestorableTime: {{ .Values.backups.trackLatestRestorableTime }} diff --git a/charts/pg-db/values.yaml b/charts/pg-db/values.yaml index e0dd7879..71e356d9 100644 --- a/charts/pg-db/values.yaml +++ b/charts/pg-db/values.yaml @@ -465,6 +465,7 @@ pmm: # imagePullPolicy: IfNotPresent secret: cluster1-pmm-secret serverHost: monitoring-service + querySource: pgstatmonitor # resources: # requests: # memory: 200M diff --git a/charts/pg-operator/crds/crd.yaml b/charts/pg-operator/crds/crd.yaml index 06c49ac6..77f0a92c 100644 --- a/charts/pg-operator/crds/crd.yaml +++ b/charts/pg-operator/crds/crd.yaml @@ -5613,6 +5613,9 @@ spec: required: - repos type: object + trackLatestRestorableTime: + description: Enable tracking latest restorable time + type: boolean required: - pgbackrest type: object @@ -14230,6 +14233,12 @@ spec: - Never - IfNotPresent type: string + querySource: + default: pgstatmonitor + enum: + - pgstatmonitor + - pgstatstatements + type: string resources: description: Compute resources of a PMM container. properties: @@ -14298,6 +14307,7 @@ spec: required: - enabled - image + - querySource - secret - serverHost type: object @@ -33658,6 +33668,8 @@ spec: type: boolean pgStatMonitor: type: boolean + pgStatStatements: + type: boolean type: object image: description: |-