From 077e0003d41746a0052564ee1487d981f125cec9 Mon Sep 17 00:00:00 2001 From: Dawud Date: Thu, 14 Mar 2024 13:21:57 +0000 Subject: Change logic for plugins in grafana image build Co-authored-by: Will Szumski Change-Id: I2b1c95395aeefb2ccb1d8edf415eee0f98c52190 --- docker/grafana/Dockerfile.j2 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index cd4e94540..a769945e4 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -22,9 +22,12 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start {% block grafana_plugins_install %} -RUN grafana-cli plugins install gnocchixyz-gnocchi-datasource \ - && grafana-cli plugins install grafana-opensearch-datasource +{% set grafana_default_plugins = ['gnocchixyz-gnocchi-datasource', 'grafana-opensearch-datasource'] %} +{% set grafana_plugins = grafana_default_plugins | customizable("plugins") %} +{% if grafana_plugins | length > 0 %} +RUN {{ (['grafana-cli plugins install %s'] * grafana_plugins | length ) | join(' && ') | format(*grafana_plugins) }} +{% endif %} {% endblock %} RUN chmod 750 /etc/sudoers.d \ -- cgit v1.2.3