From b485e40823b23a28bff94d874bbefe0feeb474f2 Mon Sep 17 00:00:00 2001 From: igorbernstein <igor.bernstein@gmail.com> Date: Tue, 20 Feb 2024 08:31:15 -0500 Subject: [PATCH] deployment/docker: clean up loading of victoriametrics-datasource (#5793) Currently the docker-compose examples for loading `victoriametrics-datasource` uses 2 environment variables: - `GF_ALLOW_LOADING_UNSIGNED_PLUGINS` - `GF_DEFAULT_APP_MODE` I believe both of the env vars are trying to achieve the same thing. `GF_DEFAULT_APP_MODE` disables code signing for all plugins and `GF_ALLOW_LOADING_UNSIGNED_PLUGINS` intends to disable code signing for just `victoriametrics-datasource`. Keeping the scope narrowed to just `victoriametrics-datasource` would be preferable in this case. Unfortunately `GF_ALLOW_LOADING_UNSIGNED_PLUGINS` is misspelled. According to [grafana docs](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#override-configuration-with-environment-variables), the format is supposed to be `GF_<SectionName>_<KeyName>`. In other words the current env var is missing the section name. This PR proposes to: 1. fix the typo 2. remove the global disablement of code signing Alternatively, if you prefer to keep codesigning disabled globally, please remove `GF_ALLOW_LOADING_UNSIGNED_PLUGINS` env var as it confuses things (cherry picked from commit cc5a274e4de79696ce9b8b72a6a90138dab781dd) --- deployment/docker/vm-datasource/docker-compose-cluster.yml | 3 +-- deployment/docker/vm-datasource/docker-compose.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deployment/docker/vm-datasource/docker-compose-cluster.yml b/deployment/docker/vm-datasource/docker-compose-cluster.yml index fad4e7629d..948c6d12c5 100644 --- a/deployment/docker/vm-datasource/docker-compose-cluster.yml +++ b/deployment/docker/vm-datasource/docker-compose-cluster.yml @@ -19,6 +19,5 @@ services: - ./../../dashboards/vm/vmalert.json:/var/lib/grafana/dashboards/vmalert.json - ./vm-datasource/download.sh:/download.sh environment: - - "GF_ALLOW_LOADING_UNSIGNED_PLUGINS=victoriametrics-datasource" - - "GF_DEFAULT_APP_MODE=development" + - "GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=victoriametrics-datasource" restart: always diff --git a/deployment/docker/vm-datasource/docker-compose.yml b/deployment/docker/vm-datasource/docker-compose.yml index e49ddd4711..bfbf25bc6c 100644 --- a/deployment/docker/vm-datasource/docker-compose.yml +++ b/deployment/docker/vm-datasource/docker-compose.yml @@ -19,8 +19,7 @@ services: - ./../../dashboards/vm/vmalert.json:/var/lib/grafana/dashboards/vmalert.json - ./vm-datasource/download.sh:/download.sh environment: - - "GF_ALLOW_LOADING_UNSIGNED_PLUGINS=victoriametrics-datasource" - - "GF_DEFAULT_APP_MODE=development" + - "GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=victoriametrics-datasource" networks: - vm_net restart: always