Merge branch 'main' into CU-86bygcqxd_Images-Placement-for-DataStore-…

…Dashboards-Monitoring

Dockerfile

@@ -1,4 +1,4 @@
-FROM openhie/package-base:2.3.1
+FROM openhie/package-base:2.3.2
 
 # Install yq
 RUN curl -L https://github.com/mikefarah/yq/releases/download/v4.23.1/yq_linux_amd64 -o /usr/bin/yq

client-registry-jempi/docker-compose.api.yml

@@ -33,6 +33,7 @@ services:
       reverse-proxy:
       kafka:
       default:
+      jempi:
 
 
   jempi-api-kc:
@@ -77,6 +78,7 @@ services:
       reverse-proxy:
       kafka:
       default:
+      jempi:
 
 
 volumes:
@@ -87,6 +89,9 @@ networks:
   reverse-proxy:
     name: reverse-proxy_public
     external: true
+  jempi:
+    name: jempi_public
+    external: true
   kafka:
     name: kafka_public
     external: true

client-registry-jempi/docker-compose.combined-cluster.yml

@@ -6,7 +6,13 @@ services:
       placement:
         constraints:
           - "node.labels.name==node-1"
-
+
+  jempi-bootstrapper:
+    deploy:
+      placement:
+        constraints:
+          - "node.labels.name==node-1"
+
   jempi-postgresql-02:
     image: bitnami/postgresql-repmgr:15.2.0
     environment:
@@ -36,6 +42,8 @@ services:
     configs:
       - target: /docker-entrypoint-initdb.d/jempi_psql_init_db.sql
         source: jempi_psql_init_db.sql
+    networks:
+      jempi:
 
   jempi-postgresql-03:
     image: bitnami/postgresql-repmgr:15.2.0
@@ -66,7 +74,14 @@ services:
     configs:
       - target: /docker-entrypoint-initdb.d/jempi_psql_init_db.sql
         source: jempi_psql_init_db.sql
+    networks:
+      jempi:
 
 volumes:
   jempi-psql-02-data:
   jempi-psql-03-data:
+
+networks:
+  jempi:
+    name: jempi_public
+    external: true

client-registry-jempi/docker-compose.combined.yml

@@ -19,6 +19,7 @@ services:
     networks:
       kafka:
       default:
+      jempi:
 
 
   jempi-etl:
@@ -37,6 +38,7 @@ services:
     networks:
       kafka:
       default:
+      jempi:
 
 
   jempi-controller:
@@ -70,6 +72,7 @@ services:
     networks:
       kafka:
       default:
+      jempi:
 
 
   jempi-linker:
@@ -104,6 +107,7 @@ services:
     networks:
       kafka:
       default:
+      jempi:
 
   jempi-bootstrapper:
     image: jembi/jempi-bootstrapper:${JEMPI_BOOTSTRAPPER_IMAGE_TAG}
@@ -124,6 +128,7 @@ services:
     networks:
       kafka:
       default:
+      jempi:
 
   jempi-postgresql-01:
     image: bitnami/postgresql-repmgr:15.2.0
@@ -151,6 +156,8 @@ services:
     configs:
       - target: /docker-entrypoint-initdb.d/jempi_psql_init_db.sql
         source: jempi_psql_init_db.sql
+    networks:
+      jempi:
 
 volumes:
   jempi-psql-01-data:
@@ -161,7 +168,10 @@ networks:
   kafka:
     name: kafka_public
     external: true
-  defualt:
+  default:
+  jempi:
+    name: jempi_public
+    external: true
 
 
 configs:

client-registry-jempi/docker-compose.dgraph-zero-cluster.yml

@@ -7,7 +7,9 @@ services:
         constraints:
           - node.labels.name == node-1
     command: dgraph zero --my=jempi-zero-01:5080 --replicas 3 --bindall --raft "idx=1"
-
+    networks:
+      jempi:
+
   jempi-zero-02:
     image: dgraph/dgraph:v22.0.0
     volumes:
@@ -25,6 +27,8 @@ services:
       restart_policy:
         condition: on-failure
     command: dgraph zero --my=jempi-zero-02:5080 --replicas 3 --peer=jempi-zero-01:5080 --raft "idx=2"
+    networks:
+      jempi:
 
   jempi-zero-03:
     image: dgraph/dgraph:v22.0.0
@@ -43,7 +47,14 @@ services:
       restart_policy:
         condition: on-failure
     command: dgraph zero --my=jempi-zero-03:5080 --replicas 3 --peer=jempi-zero-01:5080 --raft "idx=3"
+    networks:
+      jempi:
 
 volumes:
   jempi-zero-02-data:
   jempi-zero-03-data:
+
+networks:
+  jempi:
+    name: jempi_public
+    external: true

client-registry-jempi/docker-compose.dgraph-zero.yml

@@ -15,6 +15,13 @@ services:
       restart_policy:
         condition: on-failure
     command: dgraph zero --my=jempi-zero-01:5080 --replicas 1
+    networks:
+      jempi:
 
 volumes:
   jempi-zero-01-data:
+
+networks:
+  jempi:
+    name: jempi_public
+    external: true

client-registry-jempi/docker-compose.dgraph.yml

@@ -16,6 +16,8 @@ services:
       restart_policy:
         condition: on-failure
     command: dgraph alpha --my=jempi-alpha-01:7080 --zero=jempi-zero-01:5080 --security whitelist=0.0.0.0/0 --telemetry "sentry=false;"
+    networks:
+      jempi:
 
   jempi-alpha-02:
     image: dgraph/dgraph:v22.0.0
@@ -32,6 +34,8 @@ services:
       restart_policy:
         condition: on-failure
     command: dgraph alpha --my=jempi-alpha-02:7081 --zero=jempi-zero-01:5080 --security whitelist=0.0.0.0/0 -o 1 --telemetry "sentry=false;"
+    networks:
+      jempi:
 
   jempi-alpha-03:
     image: dgraph/dgraph:v22.0.0
@@ -48,6 +52,8 @@ services:
       restart_policy:
         condition: on-failure
     command: dgraph alpha --my=jempi-alpha-03:7082 --zero=jempi-zero-01:5080 --security whitelist=0.0.0.0/0 -o 2 --telemetry "sentry=false;"
+    networks:
+      jempi:
 
   jempi-ratel:
     image: dgraph/ratel:v21.03.2
@@ -61,8 +67,15 @@ services:
       restart_policy:
         condition: on-failure
     command: dgraph-ratel
+    networks:
+      jempi:
 
 volumes:
   jempi-alpha-01-data:
   jempi-alpha-02-data:
   jempi-alpha-03-data:
+
+networks:
+  jempi:
+    name: jempi_public
+    external: true

client-registry-jempi/importer/mapping-mediator/searchAll.json

@@ -9,7 +9,7 @@
   },
   "inputTransforms": {
     "total": "$count(lookupRequests.jempiSearchAll.data.goldenRecords)",
-    "entry": "$map(lookupRequests.jempiSearchAll.data.goldenRecords, function($v) {{'fullUrl': 'Patient/' & $v.goldenId, 'resource': {'resourceType': 'Patient','id': $v.goldenId,'name': {'given': [$v.demographicData.givenName],'family': $v.demographicData.familyName},'address': [{'city': $v.demographicData.city}],'birthDate': $v.demographicData.dob,'telecom': [{'value': $v.demographicData.phoneNumber,'system': 'phone'}],'identifier': [{'system': $v.sourceId.facility,'value': $v.sourceId.patient},{'system': 'NationalID','value': $v.demographicData.nationalId}],'gender': $v.demographicData.gender}}})"
+    "entry": "$append([], $map(lookupRequests.jempiSearchAll.data.goldenRecords, function($v) {{'fullUrl': 'Patient/' & $v.goldenId, 'resource': {'resourceType': 'Patient','id': $v.goldenId,'name': {'given': [$v.demographicData.givenName],'family': $v.demographicData.familyName},'address': [{'city': $v.demographicData.city}],'birthDate': $v.demographicData.dob,'telecom': [{'value': $v.demographicData.phoneNumber,'system': 'phone'}],'identifier': [{'system': $v.sourceId.facility,'value': $v.sourceId.patient},{'system': 'NationalID','value': $v.demographicData.nationalId}],'gender': $v.demographicData.gender}}}))"
   },
   "inputMapping": {
     "constants.resourceType": "resourceType",

client-registry-jempi/swarm.sh

@@ -52,12 +52,11 @@ function initialize_package() {
     log info "Running package in PROD mode"
   fi
 
-  # Jempi not working in clustered mode, temporarily disable
-  # if [[ "$CLUSTERED_MODE" == "true" ]]; then
-  #   dgraph_cluster_compose_param="docker-compose.dgraph-cluster.yml"
-  #   dgraph_zero_cluster_compose_param="docker-compose.dgraph-zero-cluster.yml"
-  #   combined_cluster_compose_param="docker-compose.combined-cluster.yml"
-  # fi
+  if [[ "$CLUSTERED_MODE" == "true" ]]; then
+    dgraph_cluster_compose_param="docker-compose.dgraph-cluster.yml"
+    dgraph_zero_cluster_compose_param="docker-compose.dgraph-zero-cluster.yml"
+    combined_cluster_compose_param="docker-compose.combined-cluster.yml"
+  fi
 
   (
     log info "Importing JeMPI Kafka topics"

config.yaml

@@ -1,5 +1,5 @@
 projectName: platform
-image: jembi/platform:3.0.0-beta
+image: jembi/platform:latest
 logPath: /tmp/logs
 
 packages:
@@ -44,6 +44,8 @@ profiles:
       - openhim-mapping-mediator
       - kafka-mapper-consumer
       - kafka-unbundler-consumer
+      - fhir-ig-importer
+      - reprocess-mediator
     envFiles:
       - cdr-dw.env
 
@@ -75,4 +77,3 @@ profiles:
       - openhim-mapping-mediator
     envFiles:
       - mpi.env
-

fhir-ig-importer/docker-compose.dev.yml

@@ -10,5 +10,5 @@ services:
   fhir-ig-importer-ui:
     ports:
       - target: 8080
-        published: 3000
+        published: 3334
         mode: host

fhir-ig-importer/docker-compose.yml

@@ -6,6 +6,7 @@ services:
     networks:
       hapi-fhir:
       openhim:
+      default:
     environment:
       HAPI_FHIR_BASE_URL: ${HAPI_FHIR_BASE_URL}
       HAPI_FHIR_INSTANCES: ${HAPI_FHIR_INSTANCES}
@@ -27,4 +28,5 @@ networks:
   openhim:
     name: openhim_public
     external: true
+  default:
 

fhir-ig-importer/importer/docker-compose.config.yml

@@ -46,3 +46,4 @@ networks:
   openhim:
     name: openhim_public
     external: true
+  default:

fhir-ig-importer/importer/volume/ig-importer-app.json

@@ -3,7 +3,7 @@
   "description": "FHIR IG microfrontend app",
   "category": "HIE Configuration",
   "type": "esmodule",
-  "url": "http://localhost:3000/jembi-fhir-ig-importer.js",
+  "url": "http://localhost:3334/jembi-fhir-ig-importer.js",
   "showInPortal": true,
   "showInSideBar": true,
   "access_roles": ["admin"],

fhir-ig-importer/package-metadata.json

@@ -14,7 +14,7 @@
     "FHIR_IG_IMPORTER_CORE_PORT": 3001,
     "FHIR_IG_IMPORTER_CORE_HOST": "0.0.0.0",
     "FHIR_IG_IMPORTER_CORE_URL": "http://0.0.0.0:3001/fhir/ig/v1.0",
-    "FHIR_IG_IMPORTER_UI_VERSION": "0.1.0",
-    "FHIR_IG_IMPORTER_CORE_VERSION": "1.0.0"
+    "FHIR_IG_IMPORTER_UI_VERSION": "v1.0.0",
+    "FHIR_IG_IMPORTER_CORE_VERSION": "v1.0.0"
   }
 }

interoperability-layer-openhim/docker-compose.yml

@@ -50,6 +50,8 @@ services:
       KC_REALM_NAME: ${KC_REALM_NAME}
       KC_FRONTEND_URL: ${KC_FRONTEND_URL}
       OPENHIM_CONSOLE_SHOW_LOGIN: ${OPENHIM_CONSOLE_SHOW_LOGIN}
+      REACT_APP_OPENHIM_API_BASE_URL: ${OPENHIM_API_BASE_URL}
+      NODE_TLS_REJECT_UNAUTHORIZED: 0
     networks:
       reverse-proxy:
       keycloak:

interoperability-layer-openhim/package-metadata.json

@@ -6,8 +6,8 @@
   "type": "infrastructure",
   "dependencies": [],
   "environmentVariables": {
-    "OPENHIM_CORE_IMAGE": "jembi/openhim-core:microfrontends-3.0.0-beta",
-    "OPENHIM_CONSOLE_IMAGE": "jembi/openhim-console:v1.18.2",
+    "OPENHIM_CORE_IMAGE": "jembi/openhim-core:v8.4.3",
+    "OPENHIM_CONSOLE_IMAGE": "jembi/openhim-console:poc-microfrontend",
     "MONGO_IMAGE": "mongo:4.2",
     "AWAIT_HELPER_IMAGE": "jembi/await-helper:1.0.1",
     "MONGO_1_PLACEMENT": "node-1",

kafka-mapper-consumer/docker-compose.config.yml

@@ -39,3 +39,4 @@ networks:
   openhim:
     name: openhim_public
     external: true
+  default:

kafka-mapper-consumer/docker-compose.yml

@@ -21,7 +21,8 @@ services:
     networks:
       clickhouse:
       kafka:
-
+      openhim:
+      default:
   kafka-mapper-consumer-ui:
     image: ${KAFKA_CONSUMER_MAPPER_UI_VERSION}
     networks:
@@ -41,3 +42,7 @@ networks:
   kafka:
     name: kafka_public
     external: true
+  openhim:
+    name: openhim_public
+    external: true
+  default:

kafka-mapper-consumer/package-metadata.json

@@ -17,7 +17,7 @@
     "REGISTER_MEDIATOR": "true",
     "CLICKHOUSE_HOST": "analytics-datastore-clickhouse",
     "CLICKHOUSE_PORT": "8123",
-    "KAFKA_CONSUMER_MAPPER_MEDIATOR_VERSION": "jembi/kafka-mapper-consumer:0.1.0",
-    "KAFKA_CONSUMER_MAPPER_UI_VERSION": "jembi/kafka-mapper-consumer-ui:0.1.1-alpha"
+    "KAFKA_CONSUMER_MAPPER_MEDIATOR_VERSION": "jembi/kafka-mapper-consumer:v0.0.1",
+    "KAFKA_CONSUMER_MAPPER_UI_VERSION": "jembi/kafka-mapper-consumer-ui:v0.0.1"
   }
 }

mpi-mediator/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   mpi-mediator:
-    image: jembi/mpi-mediator:v2.1.1
+    image: jembi/mpi-mediator:${MPI_MEDIATOR_VERSION}
     networks:
       openhim:
       kafka: