Merge branch 'main' into 86bzmr0pe

.env.traefik.remote

@@ -26,28 +26,33 @@ JS_REPORT_PACKAGE_PATH=
 # KAFKA_TOPICS=2xx,reprocess,3xx,metrics:3:1
 KAFKA_TOPICS=2xx,2xx-async,reprocess,3xx,metrics:3:3,patient,observation
 
-OPENHIM_CORE_MEDIATOR_HOSTNAME=c9a4-41-90-68-240.ngrok-free.app
+OPENHIM_CORE_MEDIATOR_HOSTNAME=<domain>
 OPENHIM_MEDIATOR_API_PORT=443/openhimcomms
 
 # Reverse Proxy - Nginx
 REVERSE_PROXY_INSTANCES=1
-DOMAIN_NAME=c9a4-41-90-68-240.ngrok-free.app
-SUBDOMAINS=openhimcomms.<domain>,openhimcore.<domain>,openhimconsole.<domain>,kibana.<domain>,reports.<domain>,santewww.<domain>,santempi.<domain>,superset.<domain>,keycloak.<domain>,grafana.<domain>,minio.<domain>,jempi-web.<domain>,jempi-api.<domain>
+DOMAIN_NAME=<domain>
 STAGING=false
 INSECURE=false
 
 # Identity Access Manager - Keycloak
-KC_FRONTEND_URL=https://keycloak.c9a4-41-90-68-240.ngrok-free.app
+KC_FRONTEND_URL=https://keycloak.<domain>
 KC_GRAFANA_ROOT_URL=https://grafana.<domain>
 KC_JEMPI_ROOT_URL=https://jempi-web.<domain>
 KC_SUPERSET_ROOT_URL=https://superset.<domain>
-KC_OPENHIM_ROOT_URL=https://c9a4-41-90-68-240.ngrok-free.app
+KC_OPENHIM_ROOT_URL=https://<domain>
 GF_SERVER_DOMAIN=grafana.<domain>
 
 REACT_APP_JEMPI_BASE_API_HOST=https://jempi-api.<domain>
 REACT_APP_JEMPI_BASE_API_PORT=443
-OPENHIM_CONSOLE_BASE_URL=https://c9a4-41-90-68-240.ngrok-free.app
-OPENHIM_API_HOST=https://c9a4-41-90-68-240.ngrok-free.app/openhimcomms
+OPENHIM_CONSOLE_BASE_URL=https://<domain>
+OPENHIM_API_HOST=https://<domain>/openhimcomms
 OPENHIM_API_PORT=443/openhimcomms
-OPENHIM_HOST_NAME=c9a4-41-90-68-240.ngrok-free.app
+OPENHIM_HOST_NAME=<domain>
 CERT_RESOLVER=le
+CA_SERVER=https://acme-v02.api.letsencrypt.org/directory
+OPENHIM_CORE_IMAGE=jembi/openhim-core:prerelease
+OPENHIM_CONSOLE_IMAGE=jembi/openhim-console:poc-microfrontend-prelease
+GF_SERVER_ROOT_URL=https://<domain>/grafana
+GF_SERVER_DOMAIN=<domain>
+MINIO_BROWSER_REDIRECT_URL=https://<domain>/minio

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

@@ -29,7 +29,7 @@ services:
         - traefik.docker.network=reverse-proxy-traefik_public
         - traefik.http.routers.jempi-api.service=jempi-api
         - traefik.http.services.jempi-api.loadbalancer.server.port=50000
-        - traefik.http.routers.jempi-api.rule=Host(`${JEMPI_API_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME_HOST_TRAEFIK}`)
+        - traefik.http.routers.jempi-api.rule=Host(`${JEMPI_API_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME}`)
       resources:
         limits:
           memory: ${JEMPI_API_MEMORY_LIMIT}
@@ -43,6 +43,7 @@ services:
       jempi:
       postgres:
 
+
   jempi-api-kc:
     image: jembi/jempi-api-kc:${JEMPI_API_KC_IMAGE_TAG}
     environment:
@@ -89,9 +90,11 @@ services:
       jempi:
       postgres:
 
+
 volumes:
   jempi-shared-data:
 
+
 networks:
   reverse-proxy:
     name: reverse-proxy_public

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

@@ -20,7 +20,7 @@ services:
         - traefik.docker.network=reverse-proxy-traefik_public
         - traefik.http.routers.jempi-web.service=jempi-web
         - traefik.http.services.jempi-web.loadbalancer.server.port=3000
-        - traefik.http.routers.jempi-web.rule=Host(`${JEMPI_WEB_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME_HOST_TRAEFIK}`)
+        - traefik.http.routers.jempi-web.rule=Host(`${JEMPI_WEB_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME}`)
       placement:
         max_replicas_per_node: 1
       resources:
@@ -34,6 +34,7 @@ services:
       keycloak:
       default:
 
+
 networks:
   reverse-proxy:
     name: reverse-proxy_public

client-registry-santempi/docker-compose.yml

@@ -29,7 +29,7 @@ services:
         - traefik.docker.network=reverse-proxy-traefik_public
         - traefik.http.routers.santedb-mpi.service=santedb-mpi
         - traefik.http.services.santedb-mpi.loadbalancer.server.port=8080
-        - traefik.http.routers.santedb-mpi.rule=Host(`${SANTEDB_MPI_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME_HOST_TRAEFIK}`)
+        - traefik.http.routers.santedb-mpi.rule=Host(`${SANTEDB_MPI_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME}`)
     volumes:
       - santedb-data:/santedb
 
@@ -41,16 +41,17 @@ services:
         - traefik.docker.network=reverse-proxy-traefik_public
         - traefik.http.routers.santedb-www.service=santedb-www
         - traefik.http.services.santedb-www.loadbalancer.server.port=9200
-        - traefik.http.routers.santedb-www.rule=Host(`${SANTEDB_WWW_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME_HOST_TRAEFIK}`)
+        - traefik.http.routers.santedb-www.rule=Host(`${SANTEDB_WWW_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME}`)
     networks:
       default:
       reverse-proxy:
       traefik:
 
-# Sante's Match configuration is stored in the container. This will prevent the matching rules of the client registry from being lost. A docker config cannot be used for this case as the settings can be changed on Sante's UI.
+        # Sante's Match configuration is stored in the container. This will prevent the matching rules of the client registry from being lost. A docker config cannot be used for this case as the settings can be changed on Sante's UI.
 volumes:
   santedb-data:
 
+
 networks:
   mpi:
     name: mpi_public

dashboard-visualiser-jsreport/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       labels:
         - traefik.enable=true
         - traefik.docker.network=reverse-proxy-traefik_public
-        - traefik.http.routers.dashboard-visualiser-jsreport.rule=Host(`${DOMAIN_NAME_HOST_TRAEFIK}`) && PathPrefix(`${JS_REPORT_PATH_PREFIX}`)
+        - traefik.http.routers.dashboard-visualiser-jsreport.rule=Host(`${DOMAIN_NAME}`) && PathPrefix(`${JS_REPORT_PATH_PREFIX}`)
         - traefik.http.middlewares.jsreport-stripprefix.stripprefix.prefixes=${JS_REPORT_PATH_PREFIX}
         - traefik.http.routers.dashboard-visualiser-jsreport.middlewares=jsreport-stripprefix
         - traefik.http.services.dashboard-visualiser-jsreport.loadbalancer.server.port=5488
@@ -49,9 +49,11 @@ services:
       elastic:
       default:
 
+
 volumes:
   jsreport-data:
 
+
 networks:
   reverse-proxy:
     name: reverse-proxy_public

dashboard-visualiser-kibana/docker-compose.yml

@@ -17,7 +17,7 @@ services:
         - traefik.enable=true
         - traefik.docker.network=reverse-proxy-traefik_public
         - traefik.http.routers.dashboard-visualiser-kibana.service=dashboard-visualiser-kibana
-        - traefik.http.routers.dashboard-visualiser-kibana.rule=Host(`${KIBANA_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME_HOST_TRAEFIK}`)
+        - traefik.http.routers.dashboard-visualiser-kibana.rule=Host(`${KIBANA_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME}`)
         - traefik.http.services.dashboard-visualiser-kibana.loadbalancer.server.port=5601
       resources:
         limits:
@@ -33,6 +33,7 @@ services:
       elastic:
       default:
 
+
 configs:
   kibana-kibana.yml:
     file: ./kibana.yml

dashboard-visualiser-superset/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       labels:
         - traefik.enable=true
         - traefik.docker.network=reverse-proxy-traefik_public
-        - traefik.http.routers.dashboard-visualiser-superset.rule=Host(`${SUPERSET_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME_HOST_TRAEFIK}`)
+        - traefik.http.routers.dashboard-visualiser-superset.rule=Host(`${SUPERSET_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME}`)
         - traefik.http.services.dashboard-visualiser-superset.loadbalancer.server.port=8088
     environment:
       KC_SUPERSET_SSO_ENABLED: ${KC_SUPERSET_SSO_ENABLED}
@@ -46,6 +46,7 @@ services:
       postgres:
       default:
 
+
 configs:
   superset_config.py:
     file: ./config/superset_config.py
@@ -71,6 +72,7 @@ configs:
 volumes:
   superset_home:
 
+
 networks:
   clickhouse:
     name: clickhouse_public

documentation/packages/reverse-proxy-traefik/README.md

@@ -21,7 +21,7 @@ The package is an alternative reverse proxy Nginx, this reverse proxy exposes pa
 | JSReport | Sub Directory (e.g. <domain>/jsreport)                                                                 |
 | OpenHim  | Sub Domain (Frontend) Sub Directory (Backend) (e.g. openhim.<domain> and openhim.<domain>/openhimcore) |
 
-> Please ensure that the ENV "DOMAIN_NAME_HOST_TRAEFIK" is set, in this documentation we will be using the placeholder "domain" for its value
+> Please ensure that the ENV "DOMAIN_NAME" is set, in this documentation we will be using the placeholder "domain" for its value
 
 ## Subdomain-Based Reverse Proxy
 

fhir-ig-importer/docker-compose.yml

@@ -21,6 +21,8 @@ services:
       reverse-proxy:
     environment:
       FHIR_IG_IMPORTER_CORE_URL: ${FHIR_IG_IMPORTER_CORE_URL}
+      OPENHIM_API_USERNAME: ${OPENHIM_USERNAME}
+      OPENHIM_API_IG_PASSWORD: ${OPENHIM_PASSWORD}
 
 networks:
   hapi-fhir:

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

@@ -12,6 +12,7 @@ services:
       OPENHIM_API_PASSWORD: ${OPENHIM_PASSWORD}
       # Reject unauthorised is only needed if the OpenHIM's SSL is not setup
       NODE_TLS_REJECT_UNAUTHORIZED: 0
+      OPENHIM_CONSOLE_BASE_URL: ${OPENHIM_CONSOLE_BASE_URL}
     command: sh -c "node openhimConfig.js"
     configs:
       - source: fhir-ig-importer-config-importer-openhimConfig.js

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

@@ -3,7 +3,7 @@
   "description": "FHIR IG microfrontend app",
   "category": "HIE Configuration",
   "type": "esmodule",
-  "url": "https://openhimconsole.<domain>/fhir-ig-importer",
+  "url": "<openhim-console-url>/fhir-ig-importer",
   "showInPortal": true,
   "showInSideBar": true,
   "access_roles": ["admin"],

fhir-ig-importer/importer/volume/openhimConfig.js

@@ -43,6 +43,18 @@ const appJsonData = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, "ig-importer-app.json"))
 );
 
+//Substitute the url with environ variable
+
+let url = appJsonData.url;
+if (!process.env.OPENHIM_CONSOLE_BASE_URL) {
+  throw new Error("Environment variable OPENHIM_CONSOLE_BASE_URL is not set");
+}
+let newUrl = url.replace(
+  "<openhim-console-url>",
+  process.env.OPENHIM_CONSOLE_BASE_URL
+);
+
+appJsonData.url = newUrl;
 const data = JSON.stringify(jsonData);
 const appData = JSON.stringify(appJsonData);
 

fhir-ig-importer/package-metadata.json

@@ -15,6 +15,9 @@
     "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": "latest",
-    "FHIR_IG_IMPORTER_CORE_VERSION": "latest"
+    "FHIR_IG_IMPORTER_CORE_VERSION": "latest",
+    "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000",
+    "OPENHIM_API_USERNAME": "[email protected]",
+    "OPENHIM_API_IG_PASSWORD": "instant101"
   }
 }

identity-access-manager-keycloak/docker-compose.yml

@@ -8,7 +8,7 @@ services:
         "start",
         "--proxy=edge",
         "--hostname-url=${KC_FRONTEND_URL}",
-        "--import-realm",
+        "--import-realm"
       ]
     hostname: identity-access-manager-keycloak
     healthcheck:
@@ -49,17 +49,20 @@ services:
         - traefik.enable=true
         - traefik.docker.network=reverse-proxy-traefik_public
         - traefik.http.routers.identity-access-manager-keycloak.service=identity-access-manager-keycloak
+        - traefik.http.services.identity-access-manager-keycloak.loadbalancer.server.scheme=http
         - traefik.http.services.identity-access-manager-keycloak.loadbalancer.server.port=8080
-        - traefik.http.routers.identity-access-manager-keycloak.rule=Host(`${KC_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME_HOST_TRAEFIK}`)
+        - traefik.http.routers.identity-access-manager-keycloak.rule=Host(`${KC_TRAEFIK_SUBDOMAIN}.${DOMAIN_NAME}`)
         - traefik.http.routers.identity-access-manager-keycloak.tls=true
         - traefik.http.routers.identity-access-manager-keycloak.tls.certresolver=${CERT_RESOLVER}
+        - traefik.http.routers.identity-access-manager-keycloak.entrypoints=websecure
     networks:
       reverse-proxy:
       public:
       traefik:
       default:
       postgres:
 
+
 configs:
   realm.json:
     file: ./config/realm.json

interoperability-layer-openhim/docker-compose.yml

@@ -49,7 +49,7 @@ services:
         - traefik.http.services.openhimcomms.loadbalancer.server.scheme=https
         - traefik.http.routers.openhimcomms.tls=true
         - traefik.http.routers.openhimcomms.entrypoints=websecure
-        - traefik.http.routers.openhimcomms.rule=Host(`${DOMAIN_NAME_HOST_TRAEFIK}`) && PathPrefix(`/openhimcomms`)
+        - traefik.http.routers.openhimcomms.rule=Host(`${DOMAIN_NAME}`) && PathPrefix(`/openhimcomms`)
         - traefik.http.middlewares.openhimcomms-stripprefix.stripprefix.prefixes=/openhimcomms
         - traefik.http.routers.openhimcomms.middlewares=openhimcomms-stripprefix
         - traefik.http.routers.openhimcomms.tls.certresolver=le
@@ -58,14 +58,11 @@ services:
         - traefik.http.services.openhimcore.loadbalancer.server.scheme=https
         - traefik.http.routers.openhimcore.tls=true
         - traefik.http.routers.openhimcore.entrypoints=websecure
-        - traefik.http.routers.openhimcore.rule=Host(`${DOMAIN_NAME_HOST_TRAEFIK}`) && PathPrefix(`/openhimcore`)
+        - traefik.http.routers.openhimcore.rule=Host(`${DOMAIN_NAME}`) && PathPrefix(`/openhimcore`)
         - traefik.http.middlewares.openhimcore-stripprefix.stripprefix.prefixes=/openhimcore
         - traefik.http.routers.openhimcore.middlewares=openhimcore-stripprefix
         - traefik.http.routers.openhimcore.tls.certresolver=le
 
-
-
-
   openhim-console:
     image: ${OPENHIM_CONSOLE_IMAGE}
     environment:

kafka-mapper-consumer/consumer-ui-app.json

@@ -3,7 +3,7 @@
   "description": "Kafka mapper consumer microfrontends app",
   "category": "HIE Configuration",
   "type": "esmodule",
-  "url": "http://localhost:8091/jembi-kafka-mapper-consumer-ui.js",
+  "url": "<openhim-console-url>/kafka-mapper-consumer-ui",
   "showInPortal": true,
   "showInSideBar": false,
   "access_roles": ["admin"],

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

@@ -12,6 +12,7 @@ services:
       OPENHIM_API_PASSWORD: ${OPENHIM_PASSWORD}
       # Reject unauthorised is only needed if the OpenHIM's SSL is not setup
       NODE_TLS_REJECT_UNAUTHORIZED: 0
+      OPENHIM_CONSOLE_BASE_URL: ${OPENHIM_CONSOLE_BASE_URL}
     command: sh -c "node openhimConfig.js"
     configs:
       - source: kafka-mapper-consumer-openhimConfig.js

kafka-mapper-consumer/openhimConfig.js

@@ -37,6 +37,20 @@ function makeRequest(options, data) {
 const appJsonData = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, "consumer-ui-app.json"))
 );
+//Substitute the url with environ variable
+
+let url = appJsonData.url;
+
+if (!process.env.OPENHIM_CONSOLE_BASE_URL) {
+  throw new Error("Environment variable OPENHIM_CONSOLE_BASE_URL is not set");
+}
+
+let newUrl = url.replace(
+  "<openhim-console-url>",
+  process.env.OPENHIM_CONSOLE_BASE_URL
+);
+
+appJsonData.url = newUrl;
 const appData = JSON.stringify(appJsonData);
 
 const options = {

kafka-mapper-consumer/package-metadata.json

@@ -17,7 +17,8 @@
     "REGISTER_MEDIATOR": "true",
     "CLICKHOUSE_HOST": "analytics-datastore-clickhouse",
     "CLICKHOUSE_PORT": "8123",
-    "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"
+    "KAFKA_CONSUMER_MAPPER_MEDIATOR_VERSION": "jembi/kafka-mapper-consumer:latest",
+    "KAFKA_CONSUMER_MAPPER_UI_VERSION": "jembi/kafka-mapper-consumer-ui:latest",
+    "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000"
   }
 }

monitoring/docker-compose.yml

@@ -11,11 +11,13 @@ services:
         - traefik.docker.network=reverse-proxy-traefik_public
         - traefik.http.routers.grafana.service=grafana
         - traefik.http.services.grafana.loadbalancer.server.port=3000
-        - traefik.http.routers.grafana.rule=Host(${DOMAIN_NAME} && PathPrefix(`/grafana`)
+        - traefik.http.routers.grafana.rule=Host(`${DOMAIN_NAME}`) && PathPrefix(`/grafana`)
+        - traefik.http.routers.grafana.tls=true
+        - traefik.http.services.grafana.loadbalancer.server.scheme=http
+        - traefik.http.routers.grafana.entrypoints=websecure
+        - traefik.http.routers.grafana.tls.certresolver=le
         - traefik.http.middlewares.grafana-stripprefix.stripprefix.prefixes=/grafana
         - traefik.http.routers.grafana.middlewares=grafana-stripprefix
-        - traefik.http.routers.openhim-console.tls=true
-        - traefik.http.services.openhim-console.loadbalancer.server.scheme=http
     environment:
       GF_SECURITY_ADMIN_USER: ${GF_SECURITY_ADMIN_USER}
       GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD}
@@ -41,8 +43,8 @@ services:
       GF_AUTH_GENERIC_OAUTH_TOKEN_URL: "${KC_API_URL}/realms/${KC_REALM_NAME}/protocol/openid-connect/token"
       GF_AUTH_GENERIC_OAUTH_API_URL: "${KC_API_URL}/realms/${KC_REALM_NAME}/protocol/openid-connect/userinfo"
       GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH: "contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'"
-      GF_SERVER_DOMAIN: ${GF_SERVER_DOMAIN}
-      GF_SERVER_ROOT_URL: ${KC_GRAFANA_ROOT_URL}
+      GF_SERVER_DOMAIN: ${DOMAIN_NAME}
+      GF_SERVER_ROOT_URL: ${DOMAIN_NAME}
       GF_SERVER_SERVE_FROM_SUB_PATH: ${GF_SERVER_SERVE_FROM_SUB_PATH}
       GF_AUTH_SIGNOUT_REDIRECT_URL: "${KC_FRONTEND_URL}/realms/${KC_REALM_NAME}/protocol/openid-connect/logout?client_id=${KC_GRAFANA_CLIENT_ID}&post_logout_redirect_uri=${KC_GRAFANA_ROOT_URL}/login"
     configs:
@@ -177,8 +179,13 @@ services:
       labels:
         - traefik.enable=true
         - traefik.docker.network=reverse-proxy-traefik_public
-        - traefik.http.routers.minio.rule=${DOMAIN_NAME_HOST_TRAEFIK} && PathPrefix(`/minio`)
+        - traefik.http.routers.minio.service=minio
+        - traefik.http.routers.minio.rule=Host(`${DOMAIN_NAME}`) && PathPrefix(`/minio`)
         - traefik.http.services.minio.loadbalancer.server.port=9001
+        - traefik.http.routers.minio.tls=true
+        - traefik.http.services.minio.loadbalancer.server.scheme=http
+        - traefik.http.routers.minio.entrypoints=websecure
+        - traefik.http.routers.minio.tls.certresolver=le
         - traefik.http.middlewares.minio-stripprefix.stripprefix.prefixes=/minio
         - traefik.http.routers.minio.middlewares=minio-stripprefix
     networks: