IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 10:24:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

email: change default from name to Grafana

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

Fix for integration test (which is skipped but that
did not work)
This commit is contained in:
Daniel Lee 2017-02-15 10:45:04 +01:00
parent 8144b73544
commit 6dfdcd7ca5
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/defaults.ini
View File

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

2
conf/sample.ini
View File

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

2
docs/sources/http_api/admin.md
View File

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

2
docs/sources/installation/configuration.md
View File

@ -543,7 +543,7 @@ Verify SSL for smtp server? defaults to `false`
Address used when sending out emails, defaults to `admin@grafana.localhost`
### 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]

5
pkg/services/notifications/send_email_integration_test.go
View File

@ -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",
}