Merge "renaming Prometheus metrics at Grafana sample dashboard"
diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 1a750d3..909ea3a 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -84,8 +84,11 @@
# database
ENV OSMLCM_DATABASE_DRIVER mongo
-ENV OSMLCM_DATABASE_HOST mongo
-ENV OSMLCM_DATABASE_PORT 27017
+ENV OSMLCM_DATABASE_URI mongodb://mongo:27017
+#ENV OSMLCM_DATABASE_HOST mongo
+#ENV OSMLCM_DATABASE_PORT 27017
+
+
ENV OSMLCM_STORAGE_DRIVER local
ENV OSMLCM_STORAGE_PATH /app/storage
diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 5b9da33..ae93274 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -46,12 +46,17 @@
COPY scripts/ scripts/
ENV BROKER_URI kafka:9092
-ENV MONGO_URI mongo:27017
+ENV MONGO_URI mongodb://mongo:27017
ENV DATABASE sqlite:///mon_sqlite.db
ENV OS_NOTIFIER_URI localhost:8662
ENV OS_DEFAULT_GRANULARITY 300
ENV REQUEST_TIMEOUT 10
+ENV OSMMON_LOG_LEVEL INFO
+ENV OSMMON_KAFKA_LOG_LEVEL INFO
+ENV OSMMON_VCA_HOST localhost
+ENV OSMMON_VCA_SECRET secret
+ENV OSMMON_VCA_USER admin
-EXPOSE 8662
+EXPOSE 8662 8000
CMD /bin/bash scripts/runInstall.sh
diff --git a/docker/MON/scripts/runInstall.sh b/docker/MON/scripts/runInstall.sh
index 236aa3d..29695f0 100755
--- a/docker/MON/scripts/runInstall.sh
+++ b/docker/MON/scripts/runInstall.sh
@@ -22,5 +22,5 @@
##
/bin/bash /mon/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
python3 /usr/lib/python3/dist-packages/osm_mon/plugins/OpenStack/Aodh/notifier.py &
-python3 ./usr/lib/python3/dist-packages/osm_mon/core/message_bus/common_consumer.py
-
+python3 /usr/lib/python3/dist-packages/osm_mon/core/message_bus/common_consumer.py
+osm-mon-collector
diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index d2d0c36..04a9acd 100644
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -51,8 +51,10 @@
ENV OSMNBI_STORAGE_PATH /app/storage
# database
ENV OSMNBI_DATABASE_DRIVER mongo
-ENV OSMNBI_DATABASE_HOST mongo
-ENV OSMNBI_DATABASE_PORT 27017
+ENV OSMNBI_DATABASE_URI mongodb://mongo:27017
+#ENV OSMNBI_DATABASE_HOST mongo
+#ENV OSMNBI_DATABASE_PORT 27017
+
# web
ENV OSMNBI_STATIC_DIR /app/osm_nbi/html_public
# logs
diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index f5ce057..1eb8634 100644
--- a/docker/POL/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -52,8 +52,7 @@
ENV OSMPOL_MESSAGE_PORT 9092
ENV OSMPOL_DATABASE_DRIVER mongo
-ENV OSMPOL_DATABASE_HOST mongo
-ENV OSMPOL_DATABASE_PORT 27017
+ENV OSMPOL_DATABASE_URI mongodb://mongo:27017
ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db