IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-10 08:03:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Configuration: Fix env var override of sections containing hyphen (#25178)

Browse Source 
Fixes so that ini-sections containing hyphen is replaced with 
underscore. Fixes an issue with backend plugin settings.

Ref grafana/grafana-image-renderer#147
This commit is contained in:
Marcus Efraimsson 2020-05-28 16:17:55 +02:00 committed by GitHub
parent 3de3115dec
commit 34d5ffa562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ All options in the configuration file can be overridden using environment variab
GF_<SectionName>_<KeyName> GF_<SectionName>_<KeyName>
``` ```
Where the section name is the text within the brackets. Everything should be uppercase, `.` should be replaced by `_`. For example, if you have these configuration settings: Where the section name is the text within the brackets. Everything should be uppercase, `.` and `-` should be replaced by `_`. For example, if you have these configuration settings:
```bash ```bash
# default section # default section
@ -67,6 +67,9 @@ admin_user = admin
[auth.google] [auth.google]
client_secret = 0ldS3cretKey client_secret = 0ldS3cretKey
[plugin.grafana-image-renderer]
rendering_ignore_https_errors = true
``` ```
You can override them on Linux machines with: You can override them on Linux machines with:
@ -75,6 +78,7 @@ You can override them on Linux machines with:
export GF_DEFAULT_INSTANCE_NAME=my-instance export GF_DEFAULT_INSTANCE_NAME=my-instance
export GF_SECURITY_ADMIN_USER=owner export GF_SECURITY_ADMIN_USER=owner
export GF_AUTH_GOOGLE_CLIENT_SECRET=newS3cretKey export GF_AUTH_GOOGLE_CLIENT_SECRET=newS3cretKey
export GF_PLUGIN_GRAFANA_IMAGE_RENDERER_RENDERING_IGNORE_HTTPS_ERRORS=true
``` ```
> For any changes to `conf/grafana.ini` (or corresponding environment variables) to take effect, you must restart Grafana for the changes to take effect. > For any changes to `conf/grafana.ini` (or corresponding environment variables) to take effect, you must restart Grafana for the changes to take effect.
@ -849,7 +853,7 @@ Set to true if you want to test alpha plugins that are not yet ready for general
### allow_loading_unsigned_plugins ### allow_loading_unsigned_plugins
Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature. Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
## [feature_toggles] ## [feature_toggles]
### enable ### enable

1
pkg/setting/setting.go
View File

@ -373,6 +373,7 @@ func applyEnvVariableOverrides(file *ini.File) error {
func envKey(sectionName string, keyName string) string { func envKey(sectionName string, keyName string) string {
sN := strings.ToUpper(strings.Replace(sectionName, ".", "_", -1)) sN := strings.ToUpper(strings.Replace(sectionName, ".", "_", -1))
sN = strings.Replace(sN, "-", "_", -1)
kN := strings.ToUpper(strings.Replace(keyName, ".", "_", -1)) kN := strings.ToUpper(strings.Replace(keyName, ".", "_", -1))
envKey := fmt.Sprintf("GF_%s_%s", sN, kN) envKey := fmt.Sprintf("GF_%s_%s", sN, kN)
return envKey return envKey