From 72f61569622a7d5461295791124a417bfcf25291 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Mon, 10 Mar 2025 16:38:15 +0100 Subject: [PATCH 1/4] fix --- .../controllers/kube-prometheus-stack/release.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml index 9a4fe5e9..e1151dc5 100644 --- a/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml +++ b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml @@ -29,14 +29,13 @@ spec: # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml values: alertmanager: - enabled: true + enabled: false alertmanagerSpec: priorityClassName: spectrum-monitoring secrets: [ slack-api-url, slack-templates - ] - + ] config: route: group_by: @@ -96,7 +95,7 @@ spec: {{ define "__main_body_resolved" }} {{ range .Alerts }} - *Cluster:* {{ template "provider" . }}-{{- template "cluster_name" . -}}-{{- template "ip_address" . -}} + *Cluster:* {{ template "provider" . }}-{{- template "cluster_name" . -}}-{{ template "ip_address" . }} *Message:* {{ if .Annotations.resolved }}{{ .Annotations.resolved }}{{ else }}{{ .Annotations.summary }}{{ end }} *Description:* {{ if .Annotations.resolved }}{{ .Annotations.resolved }}{{ else }}{{ .Annotations.description }}{{ end }} *Started at:* {{ .StartsAt.Local.Format "02/01/06 15:04 UTC" }} From 5fdd28d3a7fb8624b4c348283de5499a073e9f11 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Mon, 10 Mar 2025 16:50:54 +0100 Subject: [PATCH 2/4] fix --- .../monitoring/controllers/kube-prometheus-stack/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml index e1151dc5..8a8688ca 100644 --- a/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml +++ b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml @@ -29,7 +29,7 @@ spec: # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml values: alertmanager: - enabled: false + enabled: true alertmanagerSpec: priorityClassName: spectrum-monitoring secrets: [ From d329405bbe16b515560a8d42179d1eea7d9e2a52 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Mon, 10 Mar 2025 17:09:11 +0100 Subject: [PATCH 3/4] fix --- .../controllers/kube-prometheus-stack/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml index 8a8688ca..e6454644 100644 --- a/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml +++ b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml @@ -29,7 +29,7 @@ spec: # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml values: alertmanager: - enabled: true + enabled: false alertmanagerSpec: priorityClassName: spectrum-monitoring secrets: [ @@ -79,12 +79,12 @@ spec: template_1.tmpl: |- {{ define "__main_title" }} [{{ .Status | toUpper }} - {{- if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{- template "provider" . -}}-{{- template "cluster_name" . -}}-{{- template "ip_address" . -}} {{ with .GroupLabels }} {{- .Values | join " " }} {{- end -}} + {{- if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{- template "provider" . -}}-{{- template "cluster_name" . -}}-{{ template "ip_address" . }} {{ with .GroupLabels }} {{- .Values | join " " }} {{- end -}} {{ end }} {{ define "__main_body_firing" }} {{ range .Alerts }} - *Cluster:* {{ template "provider" . }}-{{- template "cluster_name" . -}}-{{- template "ip_address" . -}} + *Cluster:* {{ template "provider" . }}-{{- template "cluster_name" . -}}-{{ template "ip_address" . }} *Summary:* {{ .Annotations.summary }} *Description:* {{ .Annotations.description }} *Since:* {{ .StartsAt.Local.Format "02/01/06 15:04 UTC" }} From c0987b015dc15a8159b501bf5c899d086b1f283f Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Mon, 10 Mar 2025 17:11:18 +0100 Subject: [PATCH 4/4] fix --- .../monitoring/controllers/kube-prometheus-stack/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml index e6454644..4e279a57 100644 --- a/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml +++ b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml @@ -29,7 +29,7 @@ spec: # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml values: alertmanager: - enabled: false + enabled: true alertmanagerSpec: priorityClassName: spectrum-monitoring secrets: [