From 0fb9726626e42d01c85ac54fff558f0a9bf6f035 Mon Sep 17 00:00:00 2001 From: Adrien Chauve Date: Tue, 3 Oct 2023 16:24:08 +0200 Subject: [PATCH 1/7] feat(pg): enable pg_stat_statements by default --- plugins/fabrique/charts/pg/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/fabrique/charts/pg/values.yaml b/plugins/fabrique/charts/pg/values.yaml index abd2bab7c4..7fe8ec1a08 100644 --- a/plugins/fabrique/charts/pg/values.yaml +++ b/plugins/fabrique/charts/pg/values.yaml @@ -22,6 +22,8 @@ cnpg-cluster: ~tpl~instances: "{{ or (and .Values.Parent._ProjectValues (index .Values.Parent._ProjectValues `cnpg-cluster`).instances) ((or .Values.global.isProd .Values.global.isPreProd) | ternary `3` `1`) }}" postgresqlParameters: TimeZone: "Europe/Paris" + pg_stat_statements.max: "10000" + pg_stat_statements.track: all extensions: - postgis - postgis_topology From 75654bd23e8ed2ea7a384b22ad66af3348b1b7ac Mon Sep 17 00:00:00 2001 From: Adrien Chauve Date: Tue, 3 Oct 2023 17:56:45 +0200 Subject: [PATCH 2/7] fix tests --- packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml | 4 ++++ packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml | 4 ++++ .../tests/__snapshots__/override-env-default.dev.yaml | 2 ++ packages/kontinuous/tests/__snapshots__/pg.dev.yaml | 2 ++ packages/kontinuous/tests/__snapshots__/pg.prod.yaml | 2 ++ 5 files changed, 14 insertions(+) diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml index 96bde97982..6ab2b986a6 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml @@ -599,6 +599,8 @@ spec: postgresql: parameters: TimeZone: Europe/Paris + pg_stat_statements.max: "10000" + pg_stat_statements.track: all monitoring: enablePodMonitor: false bootstrap: @@ -664,6 +666,8 @@ spec: postgresql: parameters: TimeZone: Europe/Paris + pg_stat_statements.max: "10000" + pg_stat_statements.track: all monitoring: enablePodMonitor: false bootstrap: diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml index f895757652..74b7628052 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml @@ -775,6 +775,8 @@ spec: postgresql: parameters: TimeZone: Europe/Paris + pg_stat_statements.max: "10000" + pg_stat_statements.track: all monitoring: enablePodMonitor: true bootstrap: @@ -857,6 +859,8 @@ spec: postgresql: parameters: TimeZone: Europe/Paris + pg_stat_statements.max: "10000" + pg_stat_statements.track: all monitoring: enablePodMonitor: true bootstrap: diff --git a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml index 8d50a409ec..68a43acea0 100644 --- a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml @@ -371,6 +371,8 @@ spec: postgresql: parameters: TimeZone: Europe/Paris + pg_stat_statements.max: "10000" + pg_stat_statements.track: all monitoring: enablePodMonitor: false bootstrap: diff --git a/packages/kontinuous/tests/__snapshots__/pg.dev.yaml b/packages/kontinuous/tests/__snapshots__/pg.dev.yaml index 6fab8d86e5..1bd0b50e7a 100644 --- a/packages/kontinuous/tests/__snapshots__/pg.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/pg.dev.yaml @@ -442,6 +442,8 @@ spec: postgresql: parameters: TimeZone: Europe/Paris + pg_stat_statements.max: "10000" + pg_stat_statements.track: all monitoring: enablePodMonitor: false bootstrap: diff --git a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml index 07721b8065..113d7b9035 100644 --- a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml @@ -535,6 +535,8 @@ spec: postgresql: parameters: TimeZone: Europe/Paris + pg_stat_statements.max: "10000" + pg_stat_statements.track: all monitoring: enablePodMonitor: true bootstrap: From 086ed053c2a30b5022c327068dcd8226ac639e94 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 3 Oct 2023 21:52:17 +0200 Subject: [PATCH 3/7] Update extends-ovh.dev.yaml --- packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml index 6ab2b986a6..3bebaed2c1 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml @@ -599,7 +599,7 @@ spec: postgresql: parameters: TimeZone: Europe/Paris - pg_stat_statements.max: "10000" + pg_stat_statements.max: \\"10000\\" pg_stat_statements.track: all monitoring: enablePodMonitor: false @@ -666,7 +666,7 @@ spec: postgresql: parameters: TimeZone: Europe/Paris - pg_stat_statements.max: "10000" + pg_stat_statements.max: \\"10000\\" pg_stat_statements.track: all monitoring: enablePodMonitor: false From f1ecc9a63dc6950f18d9f01293552ed48ec863e5 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 3 Oct 2023 21:52:39 +0200 Subject: [PATCH 4/7] Update extends-ovh.prod.yaml --- packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml index 74b7628052..2aad2a80aa 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml @@ -775,7 +775,7 @@ spec: postgresql: parameters: TimeZone: Europe/Paris - pg_stat_statements.max: "10000" + pg_stat_statements.max: \\"10000\\" pg_stat_statements.track: all monitoring: enablePodMonitor: true @@ -859,7 +859,7 @@ spec: postgresql: parameters: TimeZone: Europe/Paris - pg_stat_statements.max: "10000" + pg_stat_statements.max: \\"10000\\" pg_stat_statements.track: all monitoring: enablePodMonitor: true From 069a4e621ac0f597f4db2363483d2b2a490b9bec Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 3 Oct 2023 21:53:02 +0200 Subject: [PATCH 5/7] Update override-env-default.dev.yaml --- .../tests/__snapshots__/override-env-default.dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml index 68a43acea0..a225fc7a16 100644 --- a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml @@ -371,7 +371,7 @@ spec: postgresql: parameters: TimeZone: Europe/Paris - pg_stat_statements.max: "10000" + pg_stat_statements.max: \\"10000\\" pg_stat_statements.track: all monitoring: enablePodMonitor: false From f825aea9ca4a3b70c65f2cad4ba66feedd35e301 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 3 Oct 2023 21:53:19 +0200 Subject: [PATCH 6/7] Update pg.dev.yaml --- packages/kontinuous/tests/__snapshots__/pg.dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kontinuous/tests/__snapshots__/pg.dev.yaml b/packages/kontinuous/tests/__snapshots__/pg.dev.yaml index 1bd0b50e7a..fcc90f4baf 100644 --- a/packages/kontinuous/tests/__snapshots__/pg.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/pg.dev.yaml @@ -442,7 +442,7 @@ spec: postgresql: parameters: TimeZone: Europe/Paris - pg_stat_statements.max: "10000" + pg_stat_statements.max: \\"10000\\" pg_stat_statements.track: all monitoring: enablePodMonitor: false From 5b946b99f17497e39f22f95209f6fb19cea8cf8b Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 3 Oct 2023 21:53:34 +0200 Subject: [PATCH 7/7] Update pg.prod.yaml --- packages/kontinuous/tests/__snapshots__/pg.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml index 113d7b9035..5fb9cbc6fe 100644 --- a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml @@ -535,7 +535,7 @@ spec: postgresql: parameters: TimeZone: Europe/Paris - pg_stat_statements.max: "10000" + pg_stat_statements.max: \\"10000\\" pg_stat_statements.track: all monitoring: enablePodMonitor: true