projects / osm / devops.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 58b0e32)
feature(mon): Grafana env variables (user, password and URL) 44/8744/2
authorbravof <fbravo@whitestack.com>
Wed, 1 Apr 2020 14:01:11 +0000 (11:01 -0300)
committerbravof <fbravo@whitestack.com>
Wed, 1 Apr 2020 14:26:04 +0000 (11:26 -0300)
Change-Id: I21f80fa81265bf02cf9e546e7ae669d71130dbef
Signed-off-by: bravof <fbravo@whitestack.com>
.gitignore patch | blob | history
docker/MON/Dockerfile patch | blob | history

diff --git a/.gitignore b/.gitignore
index 96ee3a3..0c9f630 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,12 @@ osm-devops_*.post*
 
 #IDEs
 .idea
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
 
 #local stuff files that end in ".local" or folders called "local"
 *.local
diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index b6eff1b..9505034 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -84,6 +84,9 @@ ENV OSMMON_DATABASE_COMMONKEY changeme
 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