Install Monasca plugin for Grafana by default

Change-Id: I472af9ec8cee3462beb5aca04ea6171b79933abe
Co-Authored-By: Bartosz Bezak <bartosz@stackhpc.com>
This commit is contained in:
Isaac Prior 2019-08-13 10:45:35 +01:00 committed by Bartosz Bezak
parent e18246eb98
commit 2f92e4341f
2 changed files with 20 additions and 0 deletions

View File

@ -48,6 +48,8 @@ ENV GO_PATH=/grafana
ENV monasca_grafana_build_path=${GO_PATH}/src/github.com/grafana/grafana ENV monasca_grafana_build_path=${GO_PATH}/src/github.com/grafana/grafana
ARG monasca_grafana_version=grafana4_2 ARG monasca_grafana_version=grafana4_2
ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_grafana_version.tar.gz 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 %} {% block monasca_grafana_install %}
# NOTE(yoctozepto): Update npm to 6.x version to avoid issues with metadata parsing. # NOTE(yoctozepto): Update npm to 6.x version to avoid issues with metadata parsing.
@ -77,11 +79,24 @@ RUN gem install fpm \
{% endblock %} {% endblock %}
{% block monasca_plugins_install %}
RUN grafana-cli plugins install monasca-datasource \ RUN grafana-cli plugins install monasca-datasource \
&& chmod 750 /etc/sudoers.d \ && chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \ && chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \
&& chmod 755 /usr/local/bin/kolla_extend_start && 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 monasca_grafana_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}

View File

@ -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