From: bravof Date: Wed, 1 Apr 2020 14:01:11 +0000 (-0300) Subject: feature(mon): Grafana env variables (user, password and URL) X-Git-Tag: release-v8.0-start~52 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F44%2F8744%2F2;p=osm%2Fdevops.git feature(mon): Grafana env variables (user, password and URL) Change-Id: I21f80fa81265bf02cf9e546e7ae669d71130dbef Signed-off-by: bravof --- 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