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

Docs: Suggesting few changes to the doc (#22115)

Browse Source 
* Suggesting few changes to the doc

1. Note should be followed by a dot (.)
2. Correcting a typo in default
3.  Re-writing sub sentence to make reading better

* Update docs/sources/installation/configuration.md

Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>

* Update configuration.md

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Mohit Nain 2020-02-14 00:27:13 +05:30 committed by GitHub
parent 4f94a4c495
commit 824f7362d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ weight = 1
Grafana has a number of configuration options that you can specify in a `.ini` configuration file or specified using environment variables. Grafana has a number of configuration options that you can specify in a `.ini` configuration file or specified using environment variables.
> **Note.** You must restart Grafana for any configuration changes to take effect. > **Note:** You must restart Grafana for any configuration changes to take effect.
## Config file locations ## Config file locations
@ -147,7 +147,7 @@ Another way is put a webserver like Nginx or Apache in front of Grafana and have
`http`,`https`,`h2` or `socket` `http`,`https`,`h2` or `socket`
> **Note** Grafana versions earlier than 3.0 are vulnerable to [POODLE](https://en.wikipedia.org/wiki/POODLE). So we strongly recommend to upgrade to 3.x or use a reverse proxy for ssl termination. > **Note:** Grafana versions earlier than 3.0 are vulnerable to [POODLE](https://en.wikipedia.org/wiki/POODLE). So we strongly recommend to upgrade to 3.x or use a reverse proxy for ssl termination.
### socket ### socket
Path where the socket should be created when `protocol=socket`. Please make sure that Grafana has appropriate permissions. Path where the socket should be created when `protocol=socket`. Please make sure that Grafana has appropriate permissions.
@ -166,7 +166,7 @@ This is the full URL used to access Grafana from a web browser. This is
important if you use Google or GitHub OAuth authentication (for the important if you use Google or GitHub OAuth authentication (for the
callback URL to be correct). callback URL to be correct).
> **Note** This setting is also important if you have a reverse proxy > **Note:** This setting is also important if you have a reverse proxy
> in front of Grafana that exposes it through a subpath. In that > in front of Grafana that exposes it through a subpath. In that
> case add the subpath to the end of this URL setting. > case add the subpath to the end of this URL setting.
@ -182,7 +182,7 @@ By enabling this setting and using a subpath in `root_url` above, e.g.
### static_root_path ### static_root_path
The path to the directory where the front end files (HTML, JS, and CSS The path to the directory where the front end files (HTML, JS, and CSS
files). Default to `public` which is why the Grafana binary needs to be files). Defaults to `public` which is why the Grafana binary needs to be
executed with working directory set to the installation path. executed with working directory set to the installation path.
### enable_gzip ### enable_gzip
@ -415,7 +415,7 @@ organization to be created for that new user.
Set this value to automatically add new users to the provided org. Set this value to automatically add new users to the provided org.
This requires `auto_assign_org` to be set to `true`. Please make sure This requires `auto_assign_org` to be set to `true`. Please make sure
that this organization does already exists. that this organization already exists.
### auto_assign_org_role ### auto_assign_org_role