From 932f43b220b380a83f2519e3547785946cc8f176 Mon Sep 17 00:00:00 2001 From: Matthew Jacobson Date: Tue, 29 Mar 2022 17:22:28 +0200 Subject: [PATCH] Alerting: Add resolved count to notification title when both firing and resolved present (#46697) * Alerting: Add resolved count to notification title when both firing and resolved are present * Fix test case default_template_test.go --- pkg/services/ngalert/notifier/channels/default_template.go | 2 +- pkg/services/ngalert/notifier/channels/default_template_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/ngalert/notifier/channels/default_template.go b/pkg/services/ngalert/notifier/channels/default_template.go index a9f28345a11..7798b2fd31c 100644 --- a/pkg/services/ngalert/notifier/channels/default_template.go +++ b/pkg/services/ngalert/notifier/channels/default_template.go @@ -12,7 +12,7 @@ import ( const DefaultMessageTitleEmbed = `{{ template "default.title" . }}` var DefaultTemplateString = ` -{{ define "__subject" }}[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .GroupLabels.SortedPairs.Values | join " " }} {{ if gt (len .CommonLabels) (len .GroupLabels) }}({{ with .CommonLabels.Remove .GroupLabels.Names }}{{ .Values | join " " }}{{ end }}){{ end }}{{ end }} +{{ define "__subject" }}[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ if gt (.Alerts.Resolved | len) 0 }}, RESOLVED:{{ .Alerts.Resolved | len }}{{ end }}{{ end }}] {{ .GroupLabels.SortedPairs.Values | join " " }} {{ if gt (len .CommonLabels) (len .GroupLabels) }}({{ with .CommonLabels.Remove .GroupLabels.Names }}{{ .Values | join " " }}{{ end }}){{ end }}{{ end }} {{ define "__text_alert_list" }}{{ range . }} Value: {{ or .ValueString "[no value]" }} diff --git a/pkg/services/ngalert/notifier/channels/default_template_test.go b/pkg/services/ngalert/notifier/channels/default_template_test.go index e2eee8533e0..2647a1876be 100644 --- a/pkg/services/ngalert/notifier/channels/default_template_test.go +++ b/pkg/services/ngalert/notifier/channels/default_template_test.go @@ -86,7 +86,7 @@ func TestDefaultTemplateString(t *testing.T) { }{ { templateString: DefaultMessageTitleEmbed, - expected: `[FIRING:2] (alert1)`, + expected: `[FIRING:2, RESOLVED:2] (alert1)`, }, { templateString: `{{ template "default.message" .}}`,