From cfbccb541ba673303103859798523442cffedc12 Mon Sep 17 00:00:00 2001 From: bravof Date: Wed, 1 Apr 2020 11:01:11 -0300 Subject: [PATCH] feature(mon): Grafana env variables (user, password and URL) Change-Id: I21f80fa81265bf02cf9e546e7ae669d71130dbef Signed-off-by: bravof --- .gitignore | 6 ++++++ docker/MON/Dockerfile | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index 96ee3a36..0c9f6308 100644 --- 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 b6eff1b5..95050342 100644 --- 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 -- 2.17.1