feat(grafana): optional .grafana.env via GRAFANA_ENV_FILE, overridable GF_GITHUB_PLUGINS#6
Open
i-love-to-code wants to merge 2 commits intobartosian:mainfrom
Open
Conversation
…e GF_GITHUB_PLUGINS
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds support for an optional Grafana configuration via an additional env file and makes the Grafana plugin list overridable from
.env, without changing default behaviour for existing setups.Changes
env_file: ${GRAFANA_ENV_FILE:-/dev/null}.GRAFANA_ENV_FILEand behaviour is unchanged (no extra file).GRAFANA_ENV_FILE=.grafana.envin.envand create.grafana.envfrom.grafana.env.tmpto pass extraGF_*options to Grafana..grafana.envis in.gitignore.docker-compose.ymlanddocker-compose.macos.yml,GF_GITHUB_PLUGINSis set via${GF_GITHUB_PLUGINS:-"…"}so it can be overridden in.envwhile keeping the same default plugin URL..grafana.env.tmp→.grafana.env, setGRAFANA_ENV_FILE=.grafana.envin.env). Sample.envin README and.env.tmpinclude commentedGRAFANA_ENV_FILEand (where relevant)GF_GITHUB_PLUGINS. Fixed typos and Grafana docs link text.Backwards compatibility
GRAFANA_ENV_FILEis/dev/null, so no file is required.GF_GITHUB_PLUGINSdefault is unchanged; only overrides are new.environmentvars remain and take precedence over the optional env file.