public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Docs: Made usage of config/configuration consistent #19270 (#28167)

Browse Source 
Rebased ndeevy:docs-config/configuration-consistency-update from grafana/master to resolve conflicts

Co-authored-by: ndeevy <ndeevy@redhat.com>
This commit is contained in:
ndeevy
2020-11-03 12:09:49 +01:00
committed by GitHub
co-authored by ndeevy
parent fa567de9b8
commit 97262fb8fc
18 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/administration/cli.md
+1 -1
View File
@@ -112,7 +112,7 @@ grafana-cli --debug plugins install <plugin-id>
`--configOverrides` is a command line argument that acts like an environmental variable override.
For example, you can use it to redirect logging to another file (maybe to log plugin installations in Grafana Cloud) or when resetting the admin password and you have non-default values for some important config value (like where the database is located).
For example, you can use it to redirect logging to another file (maybe to log plugin installations in Grafana Cloud) or when resetting the admin password and you have non-default values for some important configuration value (like where the database is located).
**Example:**
```bash
docs/sources/administration/provisioning.md
+2 -2
View File
@@ -30,9 +30,9 @@ Check out the [configuration]({{< relref "configuration.md" >}}) page for more i
### Using Environment Variables
It is possible to use environment variable interpolation in all 3 provisioning config types. Allowed syntax
It is possible to use environment variable interpolation in all 3 provisioning configuration types. Allowed syntax
is either `$ENV_VAR_NAME` or `${ENV_VAR_NAME}` and can be used only for values not for keys or bigger parts
of the configs. It is not available in the dashboard's definition files just the dashboard provisioning
of the configurations. It is not available in the dashboard's definition files just the dashboard provisioning
configuration.
Example:
docs/sources/administration/security.md
+1 -1
View File
@@ -39,5 +39,5 @@ Users with the Viewer role can enter *any possible query* in *any* of the data s
To address this vulnerability, you can restrict data source query access in the following ways:
- Create multiple data sources with some restrictions added in data source config that restrict access (like database name or credentials). Then use the [Data Source Permissions]({{< relref "../permissions/datasource_permissions.md" >}}) Enterprise feature to restrict user access to the data source in Grafana.
- Create multiple data sources with some restrictions added in data source configuration that restrict access (like database name or credentials). Then use the [Data Source Permissions]({{< relref "../permissions/datasource_permissions.md" >}}) Enterprise feature to restrict user access to the data source in Grafana.
- Create a separate Grafana organization, and in that organization, create a separate data source. Make sure the data source has some option/user/credentials setting that limits access to a subset of the data. Not all data sources have an option to limit access.