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)

conf/defaults.ini

@@ -296,7 +296,7 @@ cert_file =
 key_file =
 key_file =
 skip_verify = false
 skip_verify = false
 from_address = admin@grafana.localhost
 from_address = admin@grafana.localhost
-from_name = Grafana Admin
+from_name = Grafana
 
 
 [emails]
 [emails]
 welcome_email_on_sign_up = false
 welcome_email_on_sign_up = false

conf/sample.ini

@@ -282,7 +282,7 @@
 ;key_file =
 ;key_file =
 ;skip_verify = false
 ;skip_verify = false
 ;from_address = admin@grafana.localhost
 ;from_address = admin@grafana.localhost
-;from_name = Grafana Admin
+;from_name = Grafana
 
 
 [emails]
 [emails]
 ;welcome_email_on_sign_up = false
 ;welcome_email_on_sign_up = false

docs/sources/http_api/admin.md

@@ -158,7 +158,7 @@ with Grafana admin permission.
         "cert_file":"",
         "cert_file":"",
         "enabled":"false",
         "enabled":"false",
         "from_address":"admin@grafana.localhost",
         "from_address":"admin@grafana.localhost",
-        "from_name":"Grafana Admin",
+        "from_name":"Grafana",
         "host":"localhost:25",
         "host":"localhost:25",
         "key_file":"",
         "key_file":"",
         "password":"************",
         "password":"************",

docs/sources/installation/configuration.md

@@ -543,7 +543,7 @@ Verify SSL for smtp server? defaults to `false`
 Address used when sending out emails, defaults to `admin@grafana.localhost`
 Address used when sending out emails, defaults to `admin@grafana.localhost`
 
 
 ### from_name
 ### from_name
-Name to be used when sending out emails, defaults to `Grafana Admin`
+Name to be used when sending out emails, defaults to `Grafana`
 
 
 ## [log]
 ## [log]
 
 

pkg/services/notifications/send_email_integration_test.go

@@ -25,6 +25,8 @@ func TestEmailIntegrationTest(t *testing.T) {
 		So(err, ShouldBeNil)
 		So(err, ShouldBeNil)
 
 
 		addToMailQueue = func(msg *Message) {
 		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)
 			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",
 					"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",
 					"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",
 					"AlertPageUrl":  "http://localhost:3000/alerting",
+					"EmbededImage":  "test.png",
 					"EvalMatches": []map[string]string{
 					"EvalMatches": []map[string]string{
 						{
 						{
 							"Metric": "desktop",
 							"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",
 				Template: "alert_notification.html",
 			}
 			}