aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-05-21 09:42:22 +0000
committerGerrit Code Review <review@openstack.org>2021-05-21 09:42:22 +0000
commita80de4a7926ab9188191505a86c24fe6db3fbb75 (patch)
treed2d815acd98cf11e93d0d5c783ae9e4f4a467c29
parentaa54789b61b0bd426aac59c5efa7baffb289185d (diff)
parente8533795d415e3f784a9676a2be95b19d66edf12 (diff)
downloadkolla-a80de4a7926ab9188191505a86c24fe6db3fbb75.tar.gz
kolla-a80de4a7926ab9188191505a86c24fe6db3fbb75.zip
Merge "Install Monasca datasource plugin for Grafana"
-rw-r--r--docker/grafana/Dockerfile.j23
-rw-r--r--releasenotes/notes/add-monasca-datasource-to-grafana-06dfe0ce329a7b7f.yaml6
2 files changed, 8 insertions, 1 deletions
diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2
index f1b7604fa..337b37e33 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 000000000..0bbbb5186
--- /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.