From f7e1d41b3d735b0af0de2498426413dace5ffe46 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 10 May 2019 15:09:10 +0100
Subject: [PATCH 1/2] Add travis.yml

Includes pep8, py27 and docs tox environments.

Change-Id: Id260e641d6b282806fb5b62781b4aa756bf1cb2c
(cherry picked from commit fa2afb8f218cb7bc4d10b81daccd9b7dc0b66f27)
---
 .travis.yml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..2cbda2918a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,34 @@
+---
+language: python
+python: "2.7"
+
+# Run jobs in VMs - sudo is required by ansible tests.
+sudo: required
+
+# Install ansible
+addons:
+  apt:
+    packages:
+      - gcc
+      - python-apt
+      - python-virtualenv
+      - realpath
+
+# Create a build matrix for the different test jobs.
+env:
+  matrix:
+    # Run python style checks.
+    - TOX_ENV=pep8
+    # Build documentation.
+    - TOX_ENV=docs
+    # Run python2.7 unit tests.
+    - TOX_ENV=py27
+
+install:
+  # Install tox in a virtualenv to ensure we have an up to date version.
+  - pip install -U pip
+  - pip install tox
+
+script:
+  # Run the tox environment.
+  - tox -e ${TOX_ENV}

From 49e0f96d37aa420fd711295239caecd60ecc239b Mon Sep 17 00:00:00 2001
From: Isaac Prior <Wasaac@users.noreply.github.com>
Date: Tue, 13 Aug 2019 14:20:47 +0100
Subject: [PATCH 2/2] Install Monasca plugin for Grafana by default (#39)

Change-Id: I472af9ec8cee3462beb5aca04ea6171b79933abe
(cherry picked from commit 1a93e882db18f37bb3519fa9ded86f125f5b4623)
(cherry picked from commit 791cc7ab122f96543289c25e247f72f3c75f778d)
---
 docker/monasca/monasca-grafana/Dockerfile.j2 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2
index c296b8b591..d6c697ad1f 100644
--- a/docker/monasca/monasca-grafana/Dockerfile.j2
+++ b/docker/monasca/monasca-grafana/Dockerfile.j2
@@ -82,6 +82,15 @@ RUN grafana-cli plugins install monasca-datasource \
     && 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 https://github.com/monasca/monasca-grafana/tarball/master \
+    && 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
+
 {% block monasca_grafana_footer %}{% endblock %}
 {% block footer %}{% endblock %}