From b80eb586b3e39db24a94c1ab685717674a5469f9 Mon Sep 17 00:00:00 2001 From: Inel Pandzic Date: Tue, 3 Sep 2024 11:03:55 +0200 Subject: [PATCH 1/2] Add pmm.querySource --- charts/pg-db/README.md | 1 + charts/pg-db/templates/cluster.yaml | 1 + charts/pg-db/values.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/charts/pg-db/README.md b/charts/pg-db/README.md index 027c68ea..099e9fae 100644 --- a/charts/pg-db/README.md +++ b/charts/pg-db/README.md @@ -198,6 +198,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 04a16b8f..65cda093 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: pgbackrest: diff --git a/charts/pg-db/values.yaml b/charts/pg-db/values.yaml index eb90be1c..ee7d96c3 100644 --- a/charts/pg-db/values.yaml +++ b/charts/pg-db/values.yaml @@ -464,6 +464,7 @@ pmm: # imagePullPolicy: IfNotPresent secret: cluster1-pmm-secret serverHost: monitoring-service + querySource: pgstatmonitor # resources: # requests: # memory: 200M From 1e2ae7c1b21bcaf6848656684403b589c9dcdeb4 Mon Sep 17 00:00:00 2001 From: Inel Pandzic Date: Thu, 5 Sep 2024 16:07:07 +0200 Subject: [PATCH 2/2] Update readme and crds. --- charts/pg-db/README.md | 2 +- charts/pg-operator/crds/crd.yaml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/charts/pg-db/README.md b/charts/pg-db/README.md index 099e9fae..f9437828 100644 --- a/charts/pg-db/README.md +++ b/charts/pg-db/README.md @@ -198,7 +198,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.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-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: |-