diff --git a/.gitignore b/.gitignore index 96ee3a365f5fa5b56b6b951937144d7f020118fd..0c9f63086633389b4817956b01bb511bc5a00281 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 b6eff1b55cf39dc182cb6730720e38d6e8e51ba6..95050342f18455efcb5a04a31d63b2af66bde12f 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