From 1ec4103eb400f46e72ebaca139058d2141be77b8 Mon Sep 17 00:00:00 2001 From: David <36504058+huehnervater@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:35:52 +0200 Subject: [PATCH 1/5] added variables for backup alert severity --- .../templates/px-backup/pxcentral-prometheus.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml b/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml index 8e7203988..18f89ea82 100644 --- a/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml +++ b/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml @@ -449,7 +449,7 @@ spec: expr: pxbackup_cluster_status == 5 for: 1m labels: - severity: critical + severity: "{{ .Values.pxbackup.clusterAlert.severity }}" - alert: BackupAlert annotations: @@ -459,7 +459,7 @@ spec: expr: pxbackup_backup_status == 4 for: 1m labels: - severity: critical + severity: "{{ .Values.pxbackup.backupAlert.severity }}" - alert: RestoreAlert annotations: @@ -469,7 +469,7 @@ spec: expr: pxbackup_restore_status == 4 for: 1m labels: - severity: critical + severity: "{{ .Values.pxbackup.restoreAlert.severity }}" - alert: BackupLocationAlert annotations: @@ -479,4 +479,4 @@ spec: expr: pxbackup_backup_location_status == 4 for: 1m labels: - severity: critical + severity: "{{ .Values.pxbackup.backupLocationAlert.severity }}" From 23f331d4c72e1c4e995105c4261f63ba8ea2c5ff Mon Sep 17 00:00:00 2001 From: David <36504058+huehnervater@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:40:45 +0200 Subject: [PATCH 2/5] added variables for backup alert severity --- .../templates/px-backup/pxcentral-prometheus.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml b/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml index 18f89ea82..919f97fac 100644 --- a/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml +++ b/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml @@ -449,7 +449,7 @@ spec: expr: pxbackup_cluster_status == 5 for: 1m labels: - severity: "{{ .Values.pxbackup.clusterAlert.severity }}" + severity: "{{ .Values.pxbackup.alertSeverity.clusterAlert }}" - alert: BackupAlert annotations: @@ -459,7 +459,7 @@ spec: expr: pxbackup_backup_status == 4 for: 1m labels: - severity: "{{ .Values.pxbackup.backupAlert.severity }}" + severity: "{{ .Values.pxbackup.alertSeverity.backupAlert }}" - alert: RestoreAlert annotations: @@ -469,7 +469,7 @@ spec: expr: pxbackup_restore_status == 4 for: 1m labels: - severity: "{{ .Values.pxbackup.restoreAlert.severity }}" + severity: "{{ .Values.pxbackup.alertSeverity.restoreAlert }}" - alert: BackupLocationAlert annotations: @@ -479,4 +479,4 @@ spec: expr: pxbackup_backup_location_status == 4 for: 1m labels: - severity: "{{ .Values.pxbackup.backupLocationAlert.severity }}" + severity: "{{ .Values.pxbackup.alertSeverity.backupLocationAlert }}" From 506c06b791e60a219e71c8ffceb59a70c6f29f58 Mon Sep 17 00:00:00 2001 From: David <36504058+huehnervater@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:43:09 +0200 Subject: [PATCH 3/5] added variables for px-backup alert severity --- charts/px-central/values.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/charts/px-central/values.yaml b/charts/px-central/values.yaml index 567cb9774..46673ced5 100644 --- a/charts/px-central/values.yaml +++ b/charts/px-central/values.yaml @@ -67,6 +67,11 @@ pxbackup: prometheusSecretName: "" alertmanagerSecretName: "" usePxBackupEmailAlertTemplate: true + alertSeverity: + clusterAlert: critical + backupAlert: critical + restoreAlert: critical + backupLocationAlert: critical pxlicenseserver: enabled: false From 8fc5bee12a282f7df1f1de73119ff24b86367422 Mon Sep 17 00:00:00 2001 From: David <36504058+huehnervater@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:20:27 +0200 Subject: [PATCH 4/5] changed default values --- charts/px-central/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/px-central/values.yaml b/charts/px-central/values.yaml index 46673ced5..2295e18af 100644 --- a/charts/px-central/values.yaml +++ b/charts/px-central/values.yaml @@ -68,10 +68,10 @@ pxbackup: alertmanagerSecretName: "" usePxBackupEmailAlertTemplate: true alertSeverity: - clusterAlert: critical - backupAlert: critical - restoreAlert: critical - backupLocationAlert: critical + clusterAlert: "" + backupAlert: "" + restoreAlert: "" + backupLocationAlert: "" pxlicenseserver: enabled: false From b894bdc53b7f28684f3821fea514543b0265593e Mon Sep 17 00:00:00 2001 From: David <36504058+huehnervater@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:21:44 +0200 Subject: [PATCH 5/5] added default values --- .../templates/px-backup/pxcentral-prometheus.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml b/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml index 919f97fac..ccd87a4db 100644 --- a/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml +++ b/charts/px-central/templates/px-backup/pxcentral-prometheus.yaml @@ -449,7 +449,7 @@ spec: expr: pxbackup_cluster_status == 5 for: 1m labels: - severity: "{{ .Values.pxbackup.alertSeverity.clusterAlert }}" + severity: {{ .Values.pxbackup.alertSeverity.clusterAlert | default "critical" }} - alert: BackupAlert annotations: @@ -459,7 +459,7 @@ spec: expr: pxbackup_backup_status == 4 for: 1m labels: - severity: "{{ .Values.pxbackup.alertSeverity.backupAlert }}" + severity: {{ .Values.pxbackup.alertSeverity.backupAlert | default "critical" }} - alert: RestoreAlert annotations: @@ -469,7 +469,7 @@ spec: expr: pxbackup_restore_status == 4 for: 1m labels: - severity: "{{ .Values.pxbackup.alertSeverity.restoreAlert }}" + severity: {{ .Values.pxbackup.alertSeverity.restoreAlert | default "critical" }} - alert: BackupLocationAlert annotations: @@ -479,4 +479,4 @@ spec: expr: pxbackup_backup_location_status == 4 for: 1m labels: - severity: "{{ .Values.pxbackup.alertSeverity.backupLocationAlert }}" + severity: {{ .Values.pxbackup.alertSeverity.backupLocationAlert | default "critical" }}