Merge branch 'emails'

2025-02-25 18:55:37 -06:00 · 2016-09-07 13:52:16 +02:00
parent 712061ab4f 62372978e4
commit c769148701
18 changed files with 1766 additions and 637 deletions
--- a/pkg/services/notifications/send_email_integration_test.go
+++ b/pkg/services/notifications/send_email_integration_test.go
@@ -40,7 +40,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",
-					"Events": []map[string]string{
+					"EvalMatches": []map[string]string{
 						{
 							"Metric": "desktop",
 							"Value":  "40",