From 6a9247500a418789fae8d337c1e6a32076fd2110 Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Wed, 15 Feb 2017 08:07:29 +1100 Subject: [PATCH] Update documentation to include information about from_name values --- docs/sources/http_api/admin.md | 3 ++- docs/sources/installation/configuration.md | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/sources/http_api/admin.md b/docs/sources/http_api/admin.md index 8aa00d08618..9a77e7fb2a4 100644 --- a/docs/sources/http_api/admin.md +++ b/docs/sources/http_api/admin.md @@ -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} diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 4d22d12dd9b..01f805ff175 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -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