From 323506dc81dc06141a8676b685897ce17ddb992b Mon Sep 17 00:00:00 2001
From: Jason Fox <jason-fox@users.noreply.github.com>
Date: Fri, 30 Aug 2024 13:39:14 +0200
Subject: [PATCH] Update to MongoDB 6.0

---
 .env                        |  2 +-
 docker-compose/common.yml   |  4 +---
 docker-compose/orion-ld.yml |  2 +-
 services                    | 23 +----------------------
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/.env b/.env
index 5fb55b0..f69b80b 100644
--- a/.env
+++ b/.env
@@ -8,7 +8,7 @@ ORION_LD_VERSION=1.6.0
 
 # MongoDB variables
 MONGO_DB_PORT=27017
-MONGO_DB_VERSION=4.4
+MONGO_DB_VERSION=6.0
 
 # Scorpio variables
 SCORPIO_PORT=9090
diff --git a/docker-compose/common.yml b/docker-compose/common.yml
index 6755738..c1362b8 100644
--- a/docker-compose/common.yml
+++ b/docker-compose/common.yml
@@ -53,9 +53,7 @@ services:
       - mongo-db:/data/db
       - mongo-config:/data/configdb
     healthcheck:
-      test: |
-        host=`hostname --ip-address || echo '127.0.0.1'`; 
-        mongo --quiet $host/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)' && echo 0 || echo 1    
+      test: ["CMD","mongosh", "localhost:27017/test", "--quiet"]
       interval: 5s
 
   # IoT-Agent is configured for the JSON Protocol
diff --git a/docker-compose/orion-ld.yml b/docker-compose/orion-ld.yml
index 4633616..a4fb278 100644
--- a/docker-compose/orion-ld.yml
+++ b/docker-compose/orion-ld.yml
@@ -31,7 +31,7 @@ services:
       - default
     ports:
       - ${EXPOSED_PORT:-1026}:${ORION_LD_PORT:-1026}
-    command: -dbhost mongo-db -logLevel DEBUG -forwarding  -experimental
+    command: -dbhost mongo-db -logLevel DEBUG -forwarding -mongocOnly
     healthcheck:
       test: curl --fail -s http://orion:${ORION_LD_PORT}/version || exit 1
       interval: 10s
diff --git a/services b/services
index 49e7b4b..90f32d0 100755
--- a/services
+++ b/services
@@ -140,29 +140,9 @@ loadData () {
 		--entrypoint /bin/ash quay.io/curl/curl:${CURL_VERSION} /import-data
 }
 
-addDatabaseIndex () {
-	printf "Adding appropriate \033[1mMongoDB\033[0m indexes for \033[1;34mOrion\033[0m  ..."
-	docker exec  db-mongo mongo --eval '
-	conn = new Mongo();db.createCollection("orion");
-	db = conn.getDB("orion");
-	db.createCollection("entities");
-	db.entities.createIndex({"_id.servicePath": 1, "_id.id": 1, "_id.type": 1}, {unique: true});
-	db.entities.createIndex({"_id.type": 1});
-	db.entities.createIndex({"_id.id": 1});' > /dev/null
-
-	docker exec  db-mongo mongo --eval '
-	conn = new Mongo();db.createCollection("orion-openiot");
-	db = conn.getDB("orion-openiot");
-	db.createCollection("entities");
-	db.entities.createIndex({"_id.servicePath": 1, "_id.id": 1, "_id.type": 1}, {unique: true});
-	db.entities.createIndex({"_id.type": 1});
-	db.entities.createIndex({"_id.id": 1});' > /dev/null
-	echo -e " \033[1;32mdone\033[0m"
-}
-
 addIoTDatabaseIndex () {
 	printf "Adding appropriate \033[1mMongoDB\033[0m indexes for \033[1;36mIoT-Agent\033[0m  ..."
-	docker exec  db-mongo mongo --eval '
+	docker exec db-mongo mongosh --eval '
 	conn = new Mongo();
 	db = conn.getDB("iotagentjson");
 	db.getCollectionNames().forEach(c=>db[c].drop());
@@ -218,7 +198,6 @@ case "${command}" in
 		${dockerCmd} -f docker-compose/common.yml -f docker-compose/orion-ld.yml up -d --remove-orphans --renew-anon-volumes
 		displayServices "orion|fiware"
 		waitForMongo
-		addDatabaseIndex
 		addIoTDatabaseIndex
 		waitForOrion
 		export CONTEXT_BROKER=orion:1026