From 2360b70f28f7adc06dca565b6892422e704bd4ef Mon Sep 17 00:00:00 2001 From: tuotempo Date: Wed, 11 Oct 2023 12:00:28 +0200 Subject: [PATCH 1/5] Add pxcParams and proxysqlParams keys to pmm --- charts/pxc-db/templates/cluster.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/pxc-db/templates/cluster.yaml b/charts/pxc-db/templates/cluster.yaml index a967aaa5..9f9f66c6 100644 --- a/charts/pxc-db/templates/cluster.yaml +++ b/charts/pxc-db/templates/cluster.yaml @@ -469,6 +469,12 @@ spec: {{- end }} serverHost: {{ $pmm.serverHost }} serverUser: {{ $pmm.serverUser }} + {{- if $pmm.proxysqlParams }} + proxysqlParams: {{ $pmm.proxysqlParams }} + {{- end }} + {{- if $pmm.pxcParams }} + pxcParams: {{ $pmm.pxcParams }} + {{- end }} resources: requests: {{ tpl ($pmm.resources.requests | toYaml) $ | indent 8 }} From b31c1bb3bfddc926ad97185410106e44c9d447c8 Mon Sep 17 00:00:00 2001 From: tuotempo Date: Fri, 19 Jan 2024 12:12:58 +0100 Subject: [PATCH 2/5] Added description of new pmm parameters --- charts/pxc-db/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/pxc-db/README.md b/charts/pxc-db/README.md index 490736ed..cc2a8583 100644 --- a/charts/pxc-db/README.md +++ b/charts/pxc-db/README.md @@ -215,6 +215,8 @@ The chart can be customized using the following configurable parameters: | `pmm.serverUser` | Username for accessing PXC database internals | `admin` | | `pmm.resources.requests` | PMM Container resource requests | `{"memory": "150M", "cpu": "300m"}` | | `pmm.resources.limits` | PMM Container resource limits | `{}` | +| `pmm.proxysqlParams` | [Additional PMM parameters](https://docs.percona.com/percona-operator-for-mysql/pxc/monitoring.html#specify-additional-pmm-parameters) | `{}` | +| `pmm.pxcParams` | [Additional PMM parameters](https://docs.percona.com/percona-operator-for-mysql/pxc/monitoring.html#specify-additional-pmm-parameters) | `{}` | | | | `backup.enabled` | Enables backups for PXC cluster | `true` | | `backup.allowParallel` | Allow taking multiple backups in parallel | `true` | From 6d5623e7487cabd3cf691c922ea67a9bc458951a Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Wed, 31 Jan 2024 16:16:21 +0100 Subject: [PATCH 3/5] Bump pxc-db chart version --- charts/pxc-db/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pxc-db/Chart.yaml b/charts/pxc-db/Chart.yaml index 6e37f3d1..f6d3d3eb 100644 --- a/charts/pxc-db/Chart.yaml +++ b/charts/pxc-db/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.13.0 description: A Helm chart for installing Percona XtraDB Cluster Databases using the PXC Operator. name: pxc-db home: https://www.percona.com/doc/kubernetes-operator-for-pxc/kubernetes.html -version: 1.13.5 +version: 1.13.6 maintainers: - name: tplavcic email: tomislav.plavcic@percona.com From 0699b2ef01f2074c435b7307a65cc0c1bab930b6 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Wed, 31 Jan 2024 16:40:20 +0100 Subject: [PATCH 4/5] Update values in pxc-db for pmm pxcParams and proxysqlParam --- charts/pxc-db/README.md | 4 ++-- charts/pxc-db/templates/cluster.yaml | 6 +++--- charts/pxc-db/values.yaml | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/charts/pxc-db/README.md b/charts/pxc-db/README.md index cc2a8583..a92e6323 100644 --- a/charts/pxc-db/README.md +++ b/charts/pxc-db/README.md @@ -215,8 +215,8 @@ The chart can be customized using the following configurable parameters: | `pmm.serverUser` | Username for accessing PXC database internals | `admin` | | `pmm.resources.requests` | PMM Container resource requests | `{"memory": "150M", "cpu": "300m"}` | | `pmm.resources.limits` | PMM Container resource limits | `{}` | -| `pmm.proxysqlParams` | [Additional PMM parameters](https://docs.percona.com/percona-operator-for-mysql/pxc/monitoring.html#specify-additional-pmm-parameters) | `{}` | -| `pmm.pxcParams` | [Additional PMM parameters](https://docs.percona.com/percona-operator-for-mysql/pxc/monitoring.html#specify-additional-pmm-parameters) | `{}` | +| `pmm.pxcParams` | Additional parameters which will be passed to the [pmm-admin add mysql](https://www.percona.com/doc/percona-monitoring-and-management/2.x/setting-up/client/mysql.html?_gl=1*t3eio1*_gcl_au*MTY4MTY4NTU3Ny4xNzA2NzE1MTgx#adding-mysql-service-monitoring) command for `pxc` Pods | `""` | +| `pmm.proxysqlParams` | Additional parameters which will be passed to the [pmm-admin add mysql](https://www.percona.com/doc/percona-monitoring-and-management/2.x/setting-up/client/mysql.html?_gl=1*izdl5l*_gcl_au*MTY4MTY4NTU3Ny4xNzA2NzE1MTgx#adding-mysql-service-monitoring) command for proxysql Pods | `""` | | | | `backup.enabled` | Enables backups for PXC cluster | `true` | | `backup.allowParallel` | Allow taking multiple backups in parallel | `true` | diff --git a/charts/pxc-db/templates/cluster.yaml b/charts/pxc-db/templates/cluster.yaml index 15d50766..a581e01f 100644 --- a/charts/pxc-db/templates/cluster.yaml +++ b/charts/pxc-db/templates/cluster.yaml @@ -473,12 +473,12 @@ spec: {{- end }} serverHost: {{ $pmm.serverHost }} serverUser: {{ $pmm.serverUser }} - {{- if $pmm.proxysqlParams }} - proxysqlParams: {{ $pmm.proxysqlParams }} - {{- end }} {{- if $pmm.pxcParams }} pxcParams: {{ $pmm.pxcParams }} {{- end }} + {{- if $pmm.proxysqlParams }} + proxysqlParams: {{ $pmm.proxysqlParams }} + {{- end }} resources: requests: {{ tpl ($pmm.resources.requests | toYaml) $ | indent 8 }} diff --git a/charts/pxc-db/values.yaml b/charts/pxc-db/values.yaml index e967e975..6e90f9bb 100644 --- a/charts/pxc-db/values.yaml +++ b/charts/pxc-db/values.yaml @@ -477,6 +477,8 @@ pmm: imagePullSecrets: [] serverHost: monitoring-service serverUser: admin + # pxcParams: "--disable-tablestats-limit=2000" + # proxysqlParams: "--custom-labels=CUSTOM-LABELS" resources: requests: memory: 150M From fcfb66233960c60085a5ec5cfb903c56cbf0b5f8 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Wed, 31 Jan 2024 16:47:44 +0100 Subject: [PATCH 5/5] Fix README.md for pmm.pxcParams and pmm.proxysqlParams in pxc-db --- charts/pxc-db/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/pxc-db/README.md b/charts/pxc-db/README.md index a92e6323..849cc956 100644 --- a/charts/pxc-db/README.md +++ b/charts/pxc-db/README.md @@ -215,8 +215,8 @@ The chart can be customized using the following configurable parameters: | `pmm.serverUser` | Username for accessing PXC database internals | `admin` | | `pmm.resources.requests` | PMM Container resource requests | `{"memory": "150M", "cpu": "300m"}` | | `pmm.resources.limits` | PMM Container resource limits | `{}` | -| `pmm.pxcParams` | Additional parameters which will be passed to the [pmm-admin add mysql](https://www.percona.com/doc/percona-monitoring-and-management/2.x/setting-up/client/mysql.html?_gl=1*t3eio1*_gcl_au*MTY4MTY4NTU3Ny4xNzA2NzE1MTgx#adding-mysql-service-monitoring) command for `pxc` Pods | `""` | -| `pmm.proxysqlParams` | Additional parameters which will be passed to the [pmm-admin add mysql](https://www.percona.com/doc/percona-monitoring-and-management/2.x/setting-up/client/mysql.html?_gl=1*izdl5l*_gcl_au*MTY4MTY4NTU3Ny4xNzA2NzE1MTgx#adding-mysql-service-monitoring) command for proxysql Pods | `""` | +| `pmm.pxcParams` | Additional parameters which will be passed to the [pmm-admin add mysql](https://docs.percona.com/percona-monitoring-and-management/setting-up/client/mysql.html#add-service) command for `pxc` Pods | `""` | +| `pmm.proxysqlParams` | Additional parameters which will be passed to the [pmm-admin add proxysql](https://docs.percona.com/percona-monitoring-and-management/setting-up/client/proxysql.html) command for `proxysql` Pods | `""` | | | | `backup.enabled` | Enables backups for PXC cluster | `true` | | `backup.allowParallel` | Allow taking multiple backups in parallel | `true` |