Skip to content

N
nexpie-grafana-theme
Commit adea539b by bergquist
Options

feat(alerting): add link to panel png

parent ea4b14ac
Showing with 21 additions and 15 deletions
emails/templates/alert_notification.html
...@@ -3,14 +3,16 @@ ...@@ -3,14 +3,16 @@
[[Subject .Subject "Grafana Alert: [ [[.State]] ] [[.Name]]" ]] [[Subject .Subject "Grafana Alert: [ [[.State]] ] [[.Name]]" ]]
Alertstate: [[.State]]<br /> Alertstate: [[.State]]<br />
[[.AlertPageUrl]]"<br /> [[.AlertPageUrl]]<br />
[[.DashboardLink]]"<br /> [[.DashboardLink]]<br />
[[.Description]]<br /> [[.Description]]<br />
[[if eq .State "Ok"]] [[if eq .State "Ok"]]
Everything is Ok Everything is Ok
[[end]] [[end]]
<img src="[[.DashboardImage]]" />
[[if ne .State "Ok" ]] [[if ne .State "Ok" ]]
<table class="row"> <table class="row">
<tr> <tr>
......
pkg/services/alerting/notifier.go
...@@ -64,6 +64,7 @@ func (this *EmailNotifier) Dispatch(alertResult *AlertResult) { ...@@ -64,6 +64,7 @@ func (this *EmailNotifier) Dispatch(alertResult *AlertResult) {
"TriggeredAlerts": alertResult.TriggeredAlerts, "TriggeredAlerts": alertResult.TriggeredAlerts,
"DashboardLink": grafanaUrl + "/dashboard/db/alerting", "DashboardLink": grafanaUrl + "/dashboard/db/alerting",
"AlertPageUrl": grafanaUrl + "/alerting", "AlertPageUrl": grafanaUrl + "/alerting",
"DashboardImage": grafanaUrl + "/render/dashboard-solo/db/alerting?from=1466169458375&to=1466171258375&panelId=1&width=1000&height=500",
}, },
To: []string{this.To}, To: []string{this.To},
Template: "alert_notification.html", Template: "alert_notification.html",
......
pkg/services/notifications/notifications_test.go
...@@ -45,11 +45,12 @@ func TestNotifications(t *testing.T) { ...@@ -45,11 +45,12 @@ func TestNotifications(t *testing.T) {
Convey("When sending reset email password", func() { Convey("When sending reset email password", func() {
cmd := &m.SendEmailCommand{ cmd := &m.SendEmailCommand{
Data: map[string]interface{}{ Data: map[string]interface{}{
"Name": "Name", "Name": "Name",
"State": "Critical", "State": "Critical",
"Description": "Description", "Description": "Description",
"DashboardLink": "http://localhost:3000/dashboard/db/alerting", "DashboardLink": "http://localhost:3000/dashboard/db/alerting",
"AlertPageUrl": "http://localhost:3000/alerting", "AlertPageUrl": "http://localhost:3000/alerting",
"DashboardImage": "http://localhost:3000/render/dashboard-solo/db/alerting?from=1466169458375&to=1466171258375&panelId=1&width=1000&height=500",
"TriggeredAlerts": []testTriggeredAlert{ "TriggeredAlerts": []testTriggeredAlert{
{Name: "desktop", State: "Critical", ActualValue: 13}, {Name: "desktop", State: "Critical", ActualValue: 13},
{Name: "mobile", State: "Warn", ActualValue: 5}, {Name: "mobile", State: "Warn", ActualValue: 5},
...@@ -68,18 +69,18 @@ func TestNotifications(t *testing.T) { ...@@ -68,18 +69,18 @@ func TestNotifications(t *testing.T) {
So(sentMsg.Body, ShouldContainSubstring, "Warn") So(sentMsg.Body, ShouldContainSubstring, "Warn")
So(sentMsg.Body, ShouldContainSubstring, "mobile") So(sentMsg.Body, ShouldContainSubstring, "mobile")
So(sentMsg.Body, ShouldContainSubstring, "desktop") So(sentMsg.Body, ShouldContainSubstring, "desktop")
So(sentMsg.Subject, ShouldContainSubstring, "Grafana Alert: [ Critical ] ") So(sentMsg.Subject, ShouldContainSubstring, "Grafana Alert: [ Critical ] ")
}) })
Convey("given critical", func() { Convey("given critical", func() {
cmd := &m.SendEmailCommand{ cmd := &m.SendEmailCommand{
Data: map[string]interface{}{ Data: map[string]interface{}{
"Name": "Name", "Name": "Name",
"State": "Warn", "State": "Warn",
"Description": "Description", "Description": "Description",
"DashboardLink": "http://localhost:3000/dashboard/db/alerting", "DashboardLink": "http://localhost:3000/dashboard/db/alerting",
"AlertPageUrl": "http://localhost:3000/alerting", "DashboardImage": "http://localhost:3000/render/dashboard-solo/db/alerting?from=1466169458375&to=1466171258375&panelId=1&width=1000&height=500",
"AlertPageUrl": "http://localhost:3000/alerting",
"TriggeredAlerts": []testTriggeredAlert{ "TriggeredAlerts": []testTriggeredAlert{
{Name: "desktop", State: "Critical", ActualValue: 13}, {Name: "desktop", State: "Critical", ActualValue: 13},
{Name: "mobile", State: "Warn", ActualValue: 5}, {Name: "mobile", State: "Warn", ActualValue: 5},
......
public/emails/alert_notification.html
...@@ -118,8 +118,8 @@ color: #FFFFFF !important; ...@@ -118,8 +118,8 @@ color: #FFFFFF !important;
{{Subject .Subject "Grafana Alert: [ {{.State}} ] {{.Name}}" }} {{Subject .Subject "Grafana Alert: [ {{.State}} ] {{.Name}}" }}
Alertstate: {{.State}}<br /> Alertstate: {{.State}}<br />
{{.AlertPageUrl}}"<br /> {{.AlertPageUrl}}<br />
{{.DashboardLink}}"<br /> {{.DashboardLink}}<br />
{{.Description}}<br /> {{.Description}}<br />
{{if eq .State "Ok"}} {{if eq .State "Ok"}}
...@@ -127,6 +127,8 @@ Alertstate: {{.State}}<br /> ...@@ -127,6 +127,8 @@ Alertstate: {{.State}}<br />
{{end}} {{end}}
{{if ne .State "Ok" }} {{if ne .State "Ok" }}
<img src="{{.DashboardImage}}" style="-ms-interpolation-mode: bicubic; clear: both; display: block; float: left; max-width: 100%; outline: none; text-decoration: none; width: auto" align="left" />
<table class="row" style="border-collapse: collapse; border-spacing: 0; display: block; padding: 0px; position: relative; text-align: left; vertical-align: top; width: 100%"> <table class="row" style="border-collapse: collapse; border-spacing: 0; display: block; padding: 0px; position: relative; text-align: left; vertical-align: top; width: 100%">
<tr style="padding: 0; text-align: left; vertical-align: top" align="left"> <tr style="padding: 0; text-align: left; vertical-align: top" align="left">
<td class="expander" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; vertical-align: top; visibility: hidden; width: 0px; word-break: break-word" align="left" valign="top">Serie</td> <td class="expander" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; vertical-align: top; visibility: hidden; width: 0px; word-break: break-word" align="left" valign="top">Serie</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment