IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix links in Microsoft Teams notifications (#54003)

Browse Source
This commit is contained in:
George Robinson 2022-08-22 11:08:38 +01:00 committed by GitHub
parent ee58d4ce4b
commit c960301aa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/ngalert/notifier/channels/default_template.go
View File

@ -42,13 +42,13 @@ Labels:
Annotations: Annotations:
{{ range .Annotations.SortedPairs }} - {{ .Name }} = {{ .Value }} {{ range .Annotations.SortedPairs }} - {{ .Name }} = {{ .Value }}
{{ end }} {{ end }}
{{ if gt (len .GeneratorURL) 0 }}Source: {{ .GeneratorURL }} {{ if gt (len .GeneratorURL) 0 }}Source: [{{ .GeneratorURL }}]({{ .GeneratorURL }})
{{ end }}{{ if gt (len .SilenceURL) 0 }}Silence: {{ .SilenceURL }} {{ end }}{{ if gt (len .SilenceURL) 0 }}Silence: [{{ .SilenceURL }}]({{ .SilenceURL }})
{{ end }}{{ if gt (len .DashboardURL) 0 }}Dashboard: {{ .DashboardURL }} {{ end }}{{ if gt (len .DashboardURL) 0 }}Dashboard: [{{ .DashboardURL }}]({{ .DashboardURL }})
{{ end }}{{ if gt (len .PanelURL) 0 }}Panel: {{ .PanelURL }} {{ end }}{{ if gt (len .PanelURL) 0 }}Panel: [{{ .PanelURL }}]({{ .PanelURL }})
{{ end }} {{ end }}
{{ end }}{{ end }} {{ end }}{{ end }}

24
pkg/services/ngalert/notifier/channels/default_template_test.go
View File

@ -147,13 +147,13 @@ Labels:
Annotations: Annotations:
- ann1 = annv1 - ann1 = annv1
Source: http://localhost/alert1 Source: [http://localhost/alert1](http://localhost/alert1)
Silence: http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval1 Silence: [http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval1](http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval1)
Dashboard: http://localhost/grafana/d/dbuid123 Dashboard: [http://localhost/grafana/d/dbuid123](http://localhost/grafana/d/dbuid123)
Panel: http://localhost/grafana/d/dbuid123?viewPanel=puid123 Panel: [http://localhost/grafana/d/dbuid123?viewPanel=puid123](http://localhost/grafana/d/dbuid123?viewPanel=puid123)
@ -165,9 +165,9 @@ Labels:
Annotations: Annotations:
- ann1 = annv2 - ann1 = annv2
Source: http://localhost/alert2 Source: [http://localhost/alert2](http://localhost/alert2)
Silence: http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval2 Silence: [http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval2](http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval2)
@ -182,13 +182,13 @@ Labels:
Annotations: Annotations:
- ann1 = annv3 - ann1 = annv3
Source: http://localhost/alert3 Source: [http://localhost/alert3](http://localhost/alert3)
Silence: http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval3 Silence: [http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval3](http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval3)
Dashboard: http://localhost/grafana/d/dbuid456 Dashboard: [http://localhost/grafana/d/dbuid456](http://localhost/grafana/d/dbuid456)
Panel: http://localhost/grafana/d/dbuid456?viewPanel=puid456 Panel: [http://localhost/grafana/d/dbuid456?viewPanel=puid456](http://localhost/grafana/d/dbuid456?viewPanel=puid456)
@ -200,9 +200,9 @@ Labels:
Annotations: Annotations:
- ann1 = annv4 - ann1 = annv4
Source: http://localhost/alert4 Source: [http://localhost/alert4](http://localhost/alert4)
Silence: http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval4 Silence: [http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval4](http://localhost/grafana/alerting/silence/new?alertmanager=grafana&matcher=alertname%3Dalert1&matcher=lbl1%3Dval4)
`, `,