commit 107d16a049da676f0017f64e059a130128915832
author beierlm <mark.beierl@canonical.com> Fri May 15 21:47:43 2020 -0400
committer beierlm <mark.beierl@canonical.com> Fri May 15 21:48:29 2020 -0400
tree 6e0556b6653f447d6917f39e1ab3df6ec80fb3f5
parent 19dcb19d0fb3f738c2b4de22f4e55ebd65a7f336

Merge branch 'master' into v7.0

Change-Id: Iec1f1db2b2d4953e560c8e8b7be2f6ddca86edd1
Signed-off-by: beierlm <mark.beierl@canonical.com>

docker/MON/Dockerfile

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index b6eff1b..9505034 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -84,6 +84,9 @@
 ENV OSMMON_COLLECTOR_INTERVAL 30
 ENV OSMMON_EVALUATOR_INTERVAL 30
 ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
+ENV OSMMON_GRAFANA_URL http://grafana:3000
+ENV OSMMON_GRAFANA_USER admin
+ENV OSMMON_GRAFANA_PASSWORD admin
 
 EXPOSE 8000