Merge remote-tracking branch 'origin/main' into openhim-prometheus-monitoring

Author: rcrichton

config.yaml

@@ -1,5 +1,5 @@
 projectName: platform
-image: jembi/platform:2.4.0
+image: jembi/platform:2.4.1
 logPath: /tmp/logs
 
 packages:

interoperability-layer-openhim/swarm.sh

@@ -51,11 +51,13 @@ function initialize_package() {
   (
     docker::deploy_service $STACK "${COMPOSE_FILE_PATH}" "docker-compose-mongo.yml" "$mongo_cluster_compose_filename" "$mongo_dev_compose_filename"
 
-    if [[ "${CLUSTERED_MODE}" == "true" ]] && [[ "${ACTION}" == "init" ]]; then
-      try "${COMPOSE_FILE_PATH}/initiate-replica-set.sh $STACK" throw "Fatal: Initiate Mongo replica set failed"
-    else
-      try "docker exec -i $(docker ps -q -f name=openhim_mongo) mongo --eval \"rs.initiate()\"" throw "Could not initiate replica set for the single mongo instance. Some services use \
-      mongo event listeners which only work with a replica set"
+    if [[ "${ACTION}" == "init" ]]; then
+      if [[ "${CLUSTERED_MODE}" == "true" ]]; then
+        try "${COMPOSE_FILE_PATH}/initiate-replica-set.sh $STACK" throw "Fatal: Initiate Mongo replica set failed"
+      else
+        try "docker exec -i $(docker ps -q -f name=openhim_mongo) mongo --eval \"rs.initiate()\"" throw "Could not initiate replica set for the single mongo instance. Some services use \
+        mongo event listeners which only work with a replica set"
+      fi
     fi
 
     docker::deploy_service $STACK "${COMPOSE_FILE_PATH}" "docker-compose.yml" "$openhim_dev_compose_filename"

openhim-mapping-mediator/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   openhim-mapping-mediator:
-    image: jembi/openhim-mediator-mapping:v3.1.0
+    image: jembi/openhim-mediator-mapping:v3.2.0
     environment:
       OPENHIM_REGISTER: ${OPENHIM_REGISTER}
       MONGO_URL: ${OPENHIM_MONGO_URL}
@@ -16,6 +16,7 @@ services:
       openhim:
       mongo:
       kafka:
+      public:
 
 networks:
   openhim:
@@ -28,4 +29,5 @@ networks:
     name: kafka_public
     external: true
   public:
-    name: openhim_mapping_mediator
+    name: openhim_mapping_mediator_public
+    external: true