From fd589a80e52e223164551221b360722e36108dcd Mon Sep 17 00:00:00 2001
From: Olivier Cervello <ocervello@google.com>
Date: Wed, 13 Oct 2021 12:01:32 +0200
Subject: [PATCH 1/3] Add MongoDB exporter

---
 .env               |  5 ++++-
 docker/dev.yml     |  4 ++++
 docker/mongodb.yml | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index a6e001b78cf76..c6ced5d55e6ec 100644
--- a/.env
+++ b/.env
@@ -13,10 +13,13 @@ PRODUCT_OPENER_FLAVOR_SHORT=off
 POSTGRES_USER=productopener
 POSTGRES_PASSWORD=productopener
 MONGODB_CACHE_SIZE=8 # GB
-ROBOTOFF_URL=
+MONGO_INITDB_ROOT_USERNAME=root
+MONGO_INITDB_ROOT_PASSWORD=test
+ROBOTOFF_URL=robotoff.openfoodfacts.localhost
 GOOGLE_CLOUD_VISION_API_KEY=
 CROWDIN_PROJECT_IDENTIFIER=
 CROWDIN_PROJECT_KEY=
 GEOLITE2_PATH=
 GEOLITE2_LICENSE_KEY=
 GEOLITE2_ACCOUNT_ID=
+ELASTICSEARCH_HOSTS=
diff --git a/docker/dev.yml b/docker/dev.yml
index 46ab82b8376a2..4b7aca5d231c5 100644
--- a/docker/dev.yml
+++ b/docker/dev.yml
@@ -35,6 +35,10 @@ services:
       dockerfile: Dockerfile.frontend
   mongodb:
     image: mongo:4.4
+    command: mongod --wiredTigerCacheSizeGB ${MONGODB_CACHE_SIZE}
+    environment:
+      - MONGO_INITDB_ROOT_USERNAME
+      - MONGO_INITDB_ROOT_PASSWORD
     networks:
       - webnet
 volumes:
diff --git a/docker/mongodb.yml b/docker/mongodb.yml
index 5524d3d57fd0c..9226ded9f9c4e 100644
--- a/docker/mongodb.yml
+++ b/docker/mongodb.yml
@@ -6,8 +6,22 @@ services:
     command: mongod --wiredTigerCacheSizeGB ${MONGODB_CACHE_SIZE}
     volumes:
       - dbdata:/data/db
+    environment:
+      - MONGO_INITDB_ROOT_USERNAME
+      - MONGO_INITDB_ROOT_PASSWORD
     ports:
       - 27017:27017
+    networks:
+      - db
+  mongodb_exporter:
+    image: bitnami/mongodb-exporter:0
+    command: mongodb_exporter --discovering-mode --mongodb.uri=mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/admin?ssl=true
+    ports:
+      - 9216:9216
+    networks:
+      - db
+networks:
+  db:
 volumes:
   dbdata:
     external: true

From 8abcae84262763d05d808e92cb8071c901c8405c Mon Sep 17 00:00:00 2001
From: Olivier Cervello <ocervello@google.com>
Date: Wed, 13 Oct 2021 12:03:56 +0200
Subject: [PATCH 2/3] Add HOST variable

---
 .env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env b/.env
index c6ced5d55e6ec..f41cb2143e2ca 100644
--- a/.env
+++ b/.env
@@ -5,6 +5,7 @@ COMPOSE_PATH_SEPARATOR=;
 COMPOSE_FILE=docker-compose.yml;docker/dev.yml
 
 TAG=latest
+HOST=host.docker.internal
 PRODUCERS_PLATFORM=0
 PRODUCT_OPENER_DOMAIN=openfoodfacts.localhost
 PRODUCT_OPENER_PORT=80

From d4e42b4a39597b52024acb97847a17a17e45b952 Mon Sep 17 00:00:00 2001
From: Olivier Cervello <ocervello@google.com>
Date: Wed, 13 Oct 2021 12:11:30 +0200
Subject: [PATCH 3/3] Update MONGODB_HOST in dev + prod envs

---
 .env                               | 1 +
 .github/workflows/mongo-deploy.yml | 1 +
 docker/mongodb.yml                 | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index f41cb2143e2ca..efbd6a63f2a16 100644
--- a/.env
+++ b/.env
@@ -13,6 +13,7 @@ PRODUCT_OPENER_FLAVOR=openfoodfacts
 PRODUCT_OPENER_FLAVOR_SHORT=off
 POSTGRES_USER=productopener
 POSTGRES_PASSWORD=productopener
+MONGODB_HOST=mongodb
 MONGODB_CACHE_SIZE=8 # GB
 MONGO_INITDB_ROOT_USERNAME=root
 MONGO_INITDB_ROOT_PASSWORD=test
diff --git a/.github/workflows/mongo-deploy.yml b/.github/workflows/mongo-deploy.yml
index f4cf35b289f9c..5265bfa90637f 100644
--- a/.github/workflows/mongo-deploy.yml
+++ b/.github/workflows/mongo-deploy.yml
@@ -58,6 +58,7 @@ jobs:
           echo "COMPOSE_PATH_SEPARATOR=;" >> .env
           echo "COMPOSE_FILE=docker/mongodb.yml" >> .env
           echo "MONGODB_CACHE_SIZE=${{ secrets.MONGODB_CACHE_SIZE }}" >> .env
+          echo "MONGODB_HOST=${{ secrets.HOST }}" >> .env
 
     - name: Create MongoDB Docker volume
       uses: appleboy/ssh-action@master
diff --git a/docker/mongodb.yml b/docker/mongodb.yml
index 9226ded9f9c4e..e6c1d4396d33e 100644
--- a/docker/mongodb.yml
+++ b/docker/mongodb.yml
@@ -15,7 +15,7 @@ services:
       - db
   mongodb_exporter:
     image: bitnami/mongodb-exporter:0
-    command: mongodb_exporter --discovering-mode --mongodb.uri=mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/admin?ssl=true
+    command: mongodb_exporter --discovering-mode --mongodb.uri=mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@${MONGODB_HOST}:27017/admin?ssl=true
     ports:
       - 9216:9216
     networks: