email: change default from name to Grafana

Changes default from name in smtp settings
from Grafana Admin to Grafana.

Fix for integration test (which is skipped but that
did not work)

pkg/services/notifications/send_email_integration_test.go

@@ -25,6 +25,8 @@ func TestEmailIntegrationTest(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		addToMailQueue = func(msg *Message) {
+			So(msg.From, ShouldEqual, "Grafana Admin <from@address.com>")
+			So(msg.To[0], ShouldEqual, "asdf@asdf.com")
 			ioutil.WriteFile("../../../tmp/test_email.html", []byte(msg.Body), 0777)
 		}
 
@@ -41,6 +43,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",
 					"EvalMatches": []map[string]string{
 						{
 							"Metric": "desktop",
@@ -52,7 +55,7 @@ func TestEmailIntegrationTest(t *testing.T) {
 						},
 					},
 				},
-				To:       []string{"asdf@asdf.com "},
+				To:       []string{"asdf@asdf.com"},
 				Template: "alert_notification.html",
 			}