diff options
| author | Dawud <dawud@stackhpc.com> | 2024-03-14 13:21:57 +0000 |
|---|---|---|
| committer | Dawud <dawud@stackhpc.com> | 2024-06-28 01:19:10 +0100 |
| commit | 077e0003d41746a0052564ee1487d981f125cec9 (patch) | |
| tree | 6a4726ce222ebdcaf2f760cbcae6419c0788ea97 /docker | |
| parent | a0e22caa8a131486de6cbcf0a4d9b13c6e7c0547 (diff) | |
| download | kolla-077e0003d41746a0052564ee1487d981f125cec9.tar.gz kolla-077e0003d41746a0052564ee1487d981f125cec9.zip | |
Change logic for plugins in grafana image build
Co-authored-by: Will Szumski <will@stackhpc.com>
Change-Id: I2b1c95395aeefb2ccb1d8edf415eee0f98c52190
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/grafana/Dockerfile.j2 | 7 |
1 files changed, 5 insertions, 2 deletions
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 \ |