From 2f92e4341f58d20e5277ebe2b1372b3ae00dc960 Mon Sep 17 00:00:00 2001
From: Isaac Prior <isaac@stackhpc.com>
Date: Tue, 13 Aug 2019 10:45:35 +0100
Subject: [PATCH] Install Monasca plugin for Grafana by default

Change-Id: I472af9ec8cee3462beb5aca04ea6171b79933abe
Co-Authored-By: Bartosz Bezak <bartosz@stackhpc.com>
---
 docker/monasca/monasca-grafana/Dockerfile.j2      | 15 +++++++++++++++
 .../add-monasca-grafana-app-ea24f8ca43fa9c7d.yaml |  5 +++++
 2 files changed, 20 insertions(+)
 create mode 100644 releasenotes/notes/add-monasca-grafana-app-ea24f8ca43fa9c7d.yaml

diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2
index b54e85771b..c76cbb98ae 100644
--- a/docker/monasca/monasca-grafana/Dockerfile.j2
+++ b/docker/monasca/monasca-grafana/Dockerfile.j2
@@ -48,6 +48,8 @@ ENV GO_PATH=/grafana
 ENV monasca_grafana_build_path=${GO_PATH}/src/github.com/grafana/grafana
 ARG monasca_grafana_version=grafana4_2
 ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_grafana_version.tar.gz
+ARG monasca_grafana_app_version=1.0.0
+ARG monasca_grafana_app_url=https://github.com/monasca/monasca-grafana/archive/$monasca_grafana_app_version.tar.gz
 
 {% block monasca_grafana_install %}
 # NOTE(yoctozepto): Update npm to 6.x version to avoid issues with metadata parsing.
@@ -77,11 +79,24 @@ RUN gem install fpm \
 
 {% endblock %}
 
+{% block monasca_plugins_install %}
+
 RUN grafana-cli plugins install monasca-datasource \
     && chmod 750 /etc/sudoers.d \
     && chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \
     && chmod 755 /usr/local/bin/kolla_extend_start
 
+RUN mkdir -p /var/lib/grafana/plugins/monasca-grafana \
+    && curl -Lo tmp.tgz ${monasca_grafana_app_url} \
+    && tar zxvf tmp.tgz -C /var/lib/grafana/plugins/monasca-grafana --strip-components=1 \
+    && rm tmp.tgz \
+    && npm install -g grunt \
+    && cd /var/lib/grafana/plugins/monasca-grafana \
+    && npm install \
+    && grunt
+
+{% endblock %}
+
 {% block monasca_grafana_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/releasenotes/notes/add-monasca-grafana-app-ea24f8ca43fa9c7d.yaml b/releasenotes/notes/add-monasca-grafana-app-ea24f8ca43fa9c7d.yaml
new file mode 100644
index 0000000000..5b45516b8e
--- /dev/null
+++ b/releasenotes/notes/add-monasca-grafana-app-ea24f8ca43fa9c7d.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add a Monasca app plugin for the Monasca fork of Grafana. Plugin provides
+    screens for viewing or configuring: Alarm Definitions, Alarms and Notifications