IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-25 08:21:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix newlines in text/plain template (#70207)

Browse Source 
Alerting: Fix newlines in text/plain template at last
This commit is contained in:
George Robinson 2023-06-16 09:02:58 +01:00 committed by GitHub
parent 9ed09257fe
commit a773b722b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emails/templates/ng_alert_notification.txt
View File

@ -7,7 +7,7 @@ You have [[ len .Alerts.Firing ]] firing alert(s), and [[ len .Alerts.Resolved ]
[[ template "__default_alerts_summarize" .Alerts.Firing ]]
[[- end ]]
[[ if .Alerts.Resolved -]]
[[- if .Alerts.Resolved ]]
([[ len .Alerts.Resolved ]]) RESOLVED
-------------
[[ template "__default_alerts_summarize" .Alerts.Resolved ]]
@ -51,12 +51,12 @@ Annotations: [[ template "__default_sorted_pairs" $annotations ]]
[[- define "__default_sorted_pairs" -]]
[[ range .SortedPairs ]]
[[ .Name ]] = [[ .Value ]]
- [[ .Name ]] = [[ .Value ]]
[[- end ]]
[[- end -]]
[[- if .Message -]]
[[ .Message ]]
[[ else -]]
[[- else -]]
[[ template "__default_message" . ]]
[[- end ]]

6
public/emails/ng_alert_notification.txt
View File

@ -7,7 +7,7 @@ You have {{ len .Alerts.Firing }} firing alert(s), and {{ len .Alerts.Resolved }
{{ template "__default_alerts_summarize" .Alerts.Firing }}
{{- end }}
{{ if .Alerts.Resolved -}}
{{- if .Alerts.Resolved }}
({{ len .Alerts.Resolved }}) RESOLVED
-------------
{{ template "__default_alerts_summarize" .Alerts.Resolved }}
@ -51,13 +51,13 @@ Annotations: {{ template "__default_sorted_pairs" $annotations }}
{{- define "__default_sorted_pairs" -}}
{{ range .SortedPairs }}
{{ .Name }} = {{ .Value }}
- {{ .Name }} = {{ .Value }}
{{- end }}
{{- end -}}
{{- if .Message -}}
{{ .Message }}
{{ else -}}
{{- else -}}
{{ template "__default_message" . }}
{{- end }}