From 5ea823a65a053d873dc59ec96a5d13285e355f44 Mon Sep 17 00:00:00 2001 From: Navaneesh Kumar Date: Wed, 27 Mar 2019 14:12:20 +0530 Subject: [PATCH] Fix: Alert email variable name typo fixed (#16232) --- emails/templates/alert_notification.html | 4 ++-- pkg/services/alerting/notifiers/email.go | 24 +++++++++---------- .../send_email_integration_test.go | 2 +- public/emails/alert_notification.html | 10 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html index e12fb4ea3e6..d41104e61e9 100644 --- a/emails/templates/alert_notification.html +++ b/emails/templates/alert_notification.html @@ -91,8 +91,8 @@ [[if ne .ImageLink "" ]] Alerting Panel [[end]] - [[if ne .EmbededImage "" ]] - Alerting Panel + [[if ne .EmbeddedImage "" ]] + Alerting Panel [[end]] diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go index 17b88f7d97f..6c7bf5edb29 100644 --- a/pkg/services/alerting/notifiers/email.go +++ b/pkg/services/alerting/notifiers/email.go @@ -76,17 +76,17 @@ func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error { SendEmailCommand: m.SendEmailCommand{ Subject: evalContext.GetNotificationTitle(), Data: map[string]interface{}{ - "Title": evalContext.GetNotificationTitle(), - "State": evalContext.Rule.State, - "Name": evalContext.Rule.Name, - "StateModel": evalContext.GetStateModel(), - "Message": evalContext.Rule.Message, - "Error": error, - "RuleUrl": ruleUrl, - "ImageLink": "", - "EmbededImage": "", - "AlertPageUrl": setting.AppUrl + "alerting", - "EvalMatches": evalContext.EvalMatches, + "Title": evalContext.GetNotificationTitle(), + "State": evalContext.Rule.State, + "Name": evalContext.Rule.Name, + "StateModel": evalContext.GetStateModel(), + "Message": evalContext.Rule.Message, + "Error": error, + "RuleUrl": ruleUrl, + "ImageLink": "", + "EmbeddedImage": "", + "AlertPageUrl": setting.AppUrl + "alerting", + "EvalMatches": evalContext.EvalMatches, }, To: this.Addresses, Template: "alert_notification.html", @@ -100,7 +100,7 @@ func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error { file, err := os.Stat(evalContext.ImageOnDiskPath) if err == nil { cmd.EmbededFiles = []string{evalContext.ImageOnDiskPath} - cmd.Data["EmbededImage"] = file.Name() + cmd.Data["EmbeddedImage"] = file.Name() } } diff --git a/pkg/services/notifications/send_email_integration_test.go b/pkg/services/notifications/send_email_integration_test.go index 201f86036d3..4459d039142 100644 --- a/pkg/services/notifications/send_email_integration_test.go +++ b/pkg/services/notifications/send_email_integration_test.go @@ -39,7 +39,7 @@ func TestEmailIntegrationTest(t *testing.T) { "RuleUrl": "http://localhost:3000/dashboard/db/graphite-dashboard", "ImageLink": "http://localhost:3000/render/dashboard-solo/db/graphite-dashboard?panelId=1&from=1471008499616&to=1471012099617&width=1000&height=500", "AlertPageUrl": "http://localhost:3000/alerting", - "EmbededImage": "test.png", + "EmbeddedImage": "test.png", "EvalMatches": []map[string]string{ { "Metric": "desktop", diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index f8a81312643..5d5cc54431f 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -3,7 +3,7 @@ - +