From cb1457fea4f2f6a5a236bcffb0ca2af804241176 Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Wed, 21 Apr 2021 11:18:49 +0100 Subject: [PATCH] Install Monasca datasource plugin for Grafana The Monasca Grafana image has been removed. This change provides a path for Monasca users to switch to using the vanilla Grafana image. Depends-On: I8f5a9b220fc8afd6ef07cb5f2142df8c6ead9bc0 Change-Id: I9db7ec2df050fa20317d84f6cea40d1f5fd42e60 (cherry picked from commit e8533795d415e3f784a9676a2be95b19d66edf12) --- docker/grafana/Dockerfile.j2 | 3 ++- .../add-monasca-datasource-to-grafana-06dfe0ce329a7b7f.yaml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/add-monasca-datasource-to-grafana-06dfe0ce329a7b7f.yaml diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index f1b7604fa0..337b37e33a 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -30,7 +30,8 @@ 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-influxdb-08-datasource + && grafana-cli plugins install grafana-influxdb-08-datasource \ + && grafana-cli plugins install monasca-datasource {% endblock %} diff --git a/releasenotes/notes/add-monasca-datasource-to-grafana-06dfe0ce329a7b7f.yaml b/releasenotes/notes/add-monasca-datasource-to-grafana-06dfe0ce329a7b7f.yaml new file mode 100644 index 0000000000..0bbbb51860 --- /dev/null +++ b/releasenotes/notes/add-monasca-datasource-to-grafana-06dfe0ce329a7b7f.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Adds the Monasca datasource plugin to the Grafana image. This + allows Monasca users to visualise metrics in Grafana without + using the Monasca Grafana fork.