IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update documentation to include information about from_name values

Browse Source
This commit is contained in:
Jacob Bednarz 2017-02-15 08:07:29 +11:00
parent 7520b4f404
commit 6a9247500a
No known key found for this signature in database
GPG Key ID: 5BDAF4B30FB432FB
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/sources/http_api/admin.md
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}

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

@ -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