From b685fc4fefee672c3bda9da8d03ebac91edce27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Str=C3=B6hl?= Date: Thu, 18 Jul 2024 09:59:40 +0200 Subject: [PATCH 01/17] report worker update to version 11.2.26 --- values_nsodev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_nsodev.yaml b/values_nsodev.yaml index 997e419..e2a9a1e 100644 --- a/values_nsodev.yaml +++ b/values_nsodev.yaml @@ -211,7 +211,7 @@ smardigo-worker: reporting: enabled: true image: - version: 11.2.25 + version: 11.2.26 smardigo-wordpress: wordpress: From 2beb07723262b412c35900309728d93baf3f577b Mon Sep 17 00:00:00 2001 From: "jan.jantzen" Date: Mon, 22 Jul 2024 08:51:42 +0200 Subject: [PATCH 02/17] qa connect restart --- values_cusqa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusqa.yaml b/values_cusqa.yaml index 74ecd69..2d5edaf 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -134,7 +134,7 @@ smardigo-connect: teamLabel: alerting-nso-mobene connect: additional_labels: - restart: 20230217-1145 + restart: 20240722-0850 domain: connect-cusqa-prodwork01.smardigo.digital ingress: customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32" From 309487760669a3b1730a4d56cac2724af196e527 Mon Sep 17 00:00:00 2001 From: "Jantzen, Jan" Date: Mon, 22 Jul 2024 06:53:06 +0000 Subject: [PATCH 03/17] Nsodev --- values_cusqa.yaml | 2 +- values_nsodev.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values_cusqa.yaml b/values_cusqa.yaml index 74ecd69..2d5edaf 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -134,7 +134,7 @@ smardigo-connect: teamLabel: alerting-nso-mobene connect: additional_labels: - restart: 20230217-1145 + restart: 20240722-0850 domain: connect-cusqa-prodwork01.smardigo.digital ingress: customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32" diff --git a/values_nsodev.yaml b/values_nsodev.yaml index 997e419..e2a9a1e 100644 --- a/values_nsodev.yaml +++ b/values_nsodev.yaml @@ -211,7 +211,7 @@ smardigo-worker: reporting: enabled: true image: - version: 11.2.25 + version: 11.2.26 smardigo-wordpress: wordpress: From 60b1796ff568c637bb521554414a5d4741c5b1b4 Mon Sep 17 00:00:00 2001 From: Hoan To Date: Mon, 22 Jul 2024 11:07:30 +0200 Subject: [PATCH 04/17] adjustments too pg-cluster config for backup rotation --- templates/cm_postgres_bkp.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/cm_postgres_bkp.yaml b/templates/cm_postgres_bkp.yaml index d91b943..d74d7f6 100644 --- a/templates/cm_postgres_bkp.yaml +++ b/templates/cm_postgres_bkp.yaml @@ -9,7 +9,7 @@ data: AWS_ENDPOINT: {{ .Values.postgres_bkp.bkp_url }} AWS_REGION: "" AWS_S3_FORCE_PATH_STYLE: "true" # needed for MinIO - BACKUP_NUM_TO_RETAIN: "7" + BACKUP_NUM_TO_RETAIN: "6" BACKUP_SCHEDULE: "00 2 * * *" CLONE_USE_WALG_RESTORE: "true" USE_WALG_BACKUP: "true" @@ -18,4 +18,4 @@ data: WAL_S3_BUCKET: postgres WAL_BUCKET_SCOPE_PREFIX: "" WAL_BUCKET_SCOPE_SUFFIX: "" - CRONTAB: "['* * * * * /nso_scripts/backup-monitoring.sh','30 2 * * * /scripts/backup_retry.sh']" \ No newline at end of file + CRONTAB: "['* * * * * /nso_scripts/backup-monitoring.sh']" \ No newline at end of file From b7681c3af555f4e32f7f2c8bc60d6ec53ff56cf3 Mon Sep 17 00:00:00 2001 From: Hoan To Date: Mon, 22 Jul 2024 11:07:30 +0200 Subject: [PATCH 05/17] adjustments too pg-cluster config for backup rotation --- templates/cm_postgres_bkp.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/cm_postgres_bkp.yaml b/templates/cm_postgres_bkp.yaml index d91b943..d74d7f6 100644 --- a/templates/cm_postgres_bkp.yaml +++ b/templates/cm_postgres_bkp.yaml @@ -9,7 +9,7 @@ data: AWS_ENDPOINT: {{ .Values.postgres_bkp.bkp_url }} AWS_REGION: "" AWS_S3_FORCE_PATH_STYLE: "true" # needed for MinIO - BACKUP_NUM_TO_RETAIN: "7" + BACKUP_NUM_TO_RETAIN: "6" BACKUP_SCHEDULE: "00 2 * * *" CLONE_USE_WALG_RESTORE: "true" USE_WALG_BACKUP: "true" @@ -18,4 +18,4 @@ data: WAL_S3_BUCKET: postgres WAL_BUCKET_SCOPE_PREFIX: "" WAL_BUCKET_SCOPE_SUFFIX: "" - CRONTAB: "['* * * * * /nso_scripts/backup-monitoring.sh','30 2 * * * /scripts/backup_retry.sh']" \ No newline at end of file + CRONTAB: "['* * * * * /nso_scripts/backup-monitoring.sh']" \ No newline at end of file From bb6ff0c2fc91b6e7bff956027afb8e074ab1546e Mon Sep 17 00:00:00 2001 From: Hoan To Date: Wed, 24 Jul 2024 11:41:38 +0200 Subject: [PATCH 06/17] increased cusqa postgres size --- values_cusqa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusqa.yaml b/values_cusqa.yaml index 2d5edaf..0e4bb47 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -98,7 +98,7 @@ smardigo-connect: postgres: spec: volume: - size: 30Gi + size: 50Gi additionalVolumes: - name: backup-monitoring-script mountPath: /nso_scripts From ad66971eede2c535676b1e8ce7c07605b1a3c0a8 Mon Sep 17 00:00:00 2001 From: Hoan To Date: Wed, 24 Jul 2024 11:41:38 +0200 Subject: [PATCH 07/17] increased cusqa postgres size --- values_cusqa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusqa.yaml b/values_cusqa.yaml index 2d5edaf..0e4bb47 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -98,7 +98,7 @@ smardigo-connect: postgres: spec: volume: - size: 30Gi + size: 50Gi additionalVolumes: - name: backup-monitoring-script mountPath: /nso_scripts From 616409dbba616133efe7581bdbbe0fc1726b962e Mon Sep 17 00:00:00 2001 From: Hoan To Date: Wed, 24 Jul 2024 11:51:36 +0200 Subject: [PATCH 08/17] increased s3 storage on cusqa --- values_cusqa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusqa.yaml b/values_cusqa.yaml index 0e4bb47..6ce4cac 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -10,7 +10,7 @@ tenant: - servers: 4 volumesPerServer: 2 storageClassName: hcloud-volumes - size: 60Gi + size: 90Gi buckets: - name: postgres region: "" From b4d4b9b666339e32f90b788ed8fe3536fc749a14 Mon Sep 17 00:00:00 2001 From: Hoan To Date: Wed, 24 Jul 2024 11:51:36 +0200 Subject: [PATCH 09/17] increased s3 storage on cusqa --- values_cusqa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusqa.yaml b/values_cusqa.yaml index 0e4bb47..6ce4cac 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -10,7 +10,7 @@ tenant: - servers: 4 volumesPerServer: 2 storageClassName: hcloud-volumes - size: 60Gi + size: 90Gi buckets: - name: postgres region: "" From a5faeabe707df72da7997b06fcf47bd5d5c98dde Mon Sep 17 00:00:00 2001 From: Hoan To Date: Fri, 26 Jul 2024 10:25:39 +0200 Subject: [PATCH 10/17] increased s3 storage qa again --- values_cusqa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusqa.yaml b/values_cusqa.yaml index 6ce4cac..212bffc 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -10,7 +10,7 @@ tenant: - servers: 4 volumesPerServer: 2 storageClassName: hcloud-volumes - size: 90Gi + size: 150Gi buckets: - name: postgres region: "" From b0777d567dc9f835871606a4004598eab66ede90 Mon Sep 17 00:00:00 2001 From: Hoan To Date: Fri, 26 Jul 2024 10:25:39 +0200 Subject: [PATCH 11/17] increased s3 storage qa again --- values_cusqa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusqa.yaml b/values_cusqa.yaml index 6ce4cac..212bffc 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -10,7 +10,7 @@ tenant: - servers: 4 volumesPerServer: 2 storageClassName: hcloud-volumes - size: 90Gi + size: 150Gi buckets: - name: postgres region: "" From 1d385c372408a82938b4c9fdcec1fd9546b2f515 Mon Sep 17 00:00:00 2001 From: Hoan To Date: Fri, 26 Jul 2024 13:24:42 +0200 Subject: [PATCH 12/17] increased postgres size cusprod --- values_cusprod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusprod.yaml b/values_cusprod.yaml index 41fc73d..b97c51c 100644 --- a/values_cusprod.yaml +++ b/values_cusprod.yaml @@ -111,7 +111,7 @@ smardigo-connect: postgres: spec: volume: - size: 400Gi + size: 600Gi monitoring: alerts: postgres: From 16c8b1bc69063b70375eb07215087d672f5be184 Mon Sep 17 00:00:00 2001 From: Hoan To Date: Fri, 26 Jul 2024 13:24:42 +0200 Subject: [PATCH 13/17] increased postgres size cusprod --- values_cusprod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusprod.yaml b/values_cusprod.yaml index 41fc73d..b97c51c 100644 --- a/values_cusprod.yaml +++ b/values_cusprod.yaml @@ -111,7 +111,7 @@ smardigo-connect: postgres: spec: volume: - size: 400Gi + size: 600Gi monitoring: alerts: postgres: From 2fbdb04dd933f94968ebf866f70fdb3476fccd40 Mon Sep 17 00:00:00 2001 From: "Annika.Biermann" Date: Mon, 29 Jul 2024 11:59:38 +0200 Subject: [PATCH 14/17] MOB-1154: reporting worker update to 11.2.28 --- values_nsodev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_nsodev.yaml b/values_nsodev.yaml index e2a9a1e..c9fe08c 100644 --- a/values_nsodev.yaml +++ b/values_nsodev.yaml @@ -211,7 +211,7 @@ smardigo-worker: reporting: enabled: true image: - version: 11.2.26 + version: 11.2.28 smardigo-wordpress: wordpress: From e740c966ac1f19eae98528513165d1e364ecfebd Mon Sep 17 00:00:00 2001 From: Hoan To Date: Mon, 29 Jul 2024 16:57:58 +0200 Subject: [PATCH 15/17] increased minio s3 on cusprod --- values_cusprod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusprod.yaml b/values_cusprod.yaml index b97c51c..23f9e8e 100644 --- a/values_cusprod.yaml +++ b/values_cusprod.yaml @@ -23,7 +23,7 @@ tenant: - servers: 4 volumesPerServer: 2 storageClassName: hcloud-volumes - size: 600Gi + size: 800Gi buckets: - name: postgres region: "" From 9ec7d53aff864ca956b43a0716683258f04221c8 Mon Sep 17 00:00:00 2001 From: Hoan To Date: Mon, 29 Jul 2024 16:57:58 +0200 Subject: [PATCH 16/17] increased minio s3 on cusprod --- values_cusprod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values_cusprod.yaml b/values_cusprod.yaml index b97c51c..23f9e8e 100644 --- a/values_cusprod.yaml +++ b/values_cusprod.yaml @@ -23,7 +23,7 @@ tenant: - servers: 4 volumesPerServer: 2 storageClassName: hcloud-volumes - size: 600Gi + size: 800Gi buckets: - name: postgres region: "" From a51718d97d876b3f8853e4f5db753d02f153e96e Mon Sep 17 00:00:00 2001 From: "jan.jantzen" Date: Mon, 5 Aug 2024 16:08:21 +0200 Subject: [PATCH 17/17] max ram cusprod connect 4-> 6Gi --- .gitignore | 1 + values_cusprod.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 62635fc..db6da37 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ charts/ .vscode/settings.json .DS_Store secrets*.yaml.dec +.idea/ \ No newline at end of file diff --git a/values_cusprod.yaml b/values_cusprod.yaml index 23f9e8e..d632c7a 100644 --- a/values_cusprod.yaml +++ b/values_cusprod.yaml @@ -149,7 +149,7 @@ smardigo-connect: config_delete_scope_enabled: true resources: limits: - memory: 4Gi + memory: 6Gi requests: cpu: "2.5" processSearch: