Merge pull request #7569 from jacobbednarz/add-sender-name-to-email

Updates mailer to include `from_name` value
This commit is contained in:
Daniel Lee
2017-02-15 10:32:06 +01:00
committed by GitHub
9 changed files with 13 additions and 3 deletions
+2 -1
View File
@@ -158,6 +158,7 @@ with Grafana admin permission.
"cert_file":"",
"enabled":"false",
"from_address":"admin@grafana.localhost",
"from_name":"Grafana Admin",
"host":"localhost:25",
"key_file":"",
"password":"************",
@@ -292,4 +293,4 @@ Change password for specific user
HTTP/1.1 200
Content-Type: application/json
{state: "new state", message: "alerts pause/un paused", "alertsAffected": 100}
{state: "new state", message: "alerts pause/un paused", "alertsAffected": 100}
@@ -542,6 +542,9 @@ Verify SSL for smtp server? defaults to `false`
### from_address
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`
## [log]
### mode