Browse Source

Update documentation to include information about from_name values

Jacob Bednarz 9 years ago
parent
commit
6a9247500a
2 changed files with 5 additions and 1 deletions
  1. 2 1
      docs/sources/http_api/admin.md
  2. 3 0
      docs/sources/installation/configuration.md

+ 2 - 1
docs/sources/http_api/admin.md

@@ -158,6 +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",
         "host":"localhost:25",
         "host":"localhost:25",
         "key_file":"",
         "key_file":"",
         "password":"************",
         "password":"************",
@@ -292,4 +293,4 @@ Change password for specific user
     HTTP/1.1 200
     HTTP/1.1 200
     Content-Type: application/json
     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 - 0
docs/sources/installation/configuration.md

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