Merge branch 'main' into CU-86byv0cyf_Add-initial-package-and-configu…

…ration-files-for-FHIR-info-Gateway

.env.remote

@@ -1,33 +1,51 @@
-# Test environment vars for remote deployment - change the values below to point to your deployed instances
+# General
 
-CLUSTERED_MODE=true
+CLUSTERED_MODE=false
 
-OPENHIM_CORE_SERVICE_NAME=<openhim_hostname>
-OPENHIM_TRANSACTION_API_PORT=<port>
-OPENHIM_MEDIATOR_API_PORT=<OPENHIM_MEDIATOR_API_PORT>
-MOCK_SERVER_HOST=<mock_service_hostname>
-MOCK_SERVER_PORT=<port>
+# Log
 
-# Analytics Datastore - Elastic Search
-ES_HOSTS="\"analytics-datastore-elastic-search-01:9200","analytics-datastore-elastic-search-02:9200","analytics-datastore-elastic-search-03:9200\""
+DEBUG=0
+BASHLOG_FILE=0
+BASHLOG_FILE_PATH=platform.log
 
-# Analytics Datastore - Clickhouse
-CLICKHOUSE_HOST=analytics-datastore-clickhouse-01
+# Data Mapper - Logstash
 
-# FHIR Datastore - HAPI FHIR
-HAPI_FHIR_INSTANCES=3
-HF_MAX_POOL_SIZE=30
-REPMGR_PARTNER_NODES=postgres-1,postgres-2,postgres-3
-POSTGRES_REPLICA_SET=postgres-1:5432,postgres-2:5432,postgres-3:5432
-HAPI_DB_SET=postgres-1:5432,postgres-2:5432,postgres-3:5432
+LOGSTASH_DEV_MOUNT=false
+LOGSTASH_PACKAGE_PATH=
 
-# Interoperability Layer - OpenHIM
-MONGO_SET_COUNT=3
-OPENHIM_MONGO_URL=mongodb://mongo-1:27017,mongo-2:27017,mongo-3:27017/openhim?replicaSet=mongo-set
-OPENHIM_MONGO_ATNAURL=mongodb://mongo-1:27017,mongo-2:27017,mongo-3:27017/openhim?replicaSet=mongo-set
+# Dashboard Visualiser - JS Report
+
+## !NOTE: MAKE SURE YOU HAVE RUN 'set-permissions.sh' SCRIPT BEFORE AND AFTER RUNNING JS REPORT
+JS_REPORT_DEV_MOUNT=false
+JS_REPORT_PACKAGE_PATH=
 
 # Message Bus - Kafka
-# Topics should comma seperated, optional include partion and repliction values
-#   e.g. <topic>:<partions>:<replicationFactor> -> test:3:2 (defaults to <topics>:3:1)
-KAFKA_TOPICS=2xx,reprocess,3xx,metrics:3:1
 
+#  !NOTE: Topics should comma seperated, optional include partion and repliction values
+#   e.g. <topic>:<partions>:<replicationFactor> -> test:3:2 (defaults to <topics>:3:1)
+# KAFKA_TOPICS=2xx,reprocess,3xx,metrics:3:1
+KAFKA_TOPICS=2xx,2xx-async,reprocess,3xx,metrics:3:3,patient,observation
+
+OPENHIM_CORE_MEDIATOR_HOSTNAME=openhimcomms.<domain>
+OPENHIM_MEDIATOR_API_PORT=443
+
+# Reverse Proxy - Nginx
+REVERSE_PROXY_INSTANCES=1
+DOMAIN_NAME=<domain>
+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>
+STAGING=false
+INSECURE=false
+
+# Identity Access Manager - Keycloak
+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://openhimconsole.<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://openhimconsole.<domain>
+OPENHIM_API_HOST=https://openhimcore.<domain>
+OPENHIM_API_PORT=443

documentation/SUMMARY.md

@@ -52,15 +52,17 @@
   * [Reverse Proxy Nginx](packages/reverse-proxy-nginx/README.md)
     * [Local Development](packages/reverse-proxy-nginx/local-development.md)
     * [Environment Variables](packages/reverse-proxy-nginx/environment-variables.md)
-* [Provisioning remote servers](provisioning-up-remote-servers/README.md)
-  * [Ansible](provisioning-up-remote-servers/ansible.md)
-  * [Terraform](provisioning-up-remote-servers/terraform.md)
+* [🗒️ Cheat sheet](cheat-sheet.md)
 * [Architecture](architecture.md)
-* [Resource Allocations](resource-allocations.md)
-* [Development](development/README.md)
-  * [Config Importing](development/config-importing.md)
-* [Disaster Recovery Process](disaster-recovery-process/README.md)
-  * [Elasticsearch](disaster-recovery-process/elasticsearch.md)
-  * [HAPI FHIR Data](disaster-recovery-process/hapi-fhir-data.md)
-  * [OpenHIM Data](disaster-recovery-process/openhim-data.md)
+* [Guides](guides/README.md)
+  * [Provisioning remote servers](guides/provisioning-up-remote-servers/README.md)
+    * [Ansible](guides/provisioning-up-remote-servers/ansible.md)
+    * [Terraform](guides/provisioning-up-remote-servers/terraform.md)
+  * [Resource Allocations](guides/resource-allocations.md)
+  * [Disaster Recovery Process](guides/disaster-recovery-process/README.md)
+    * [Elasticsearch](guides/disaster-recovery-process/elasticsearch.md)
+    * [HAPI FHIR Data](guides/disaster-recovery-process/hapi-fhir-data.md)
+    * [OpenHIM Data](guides/disaster-recovery-process/openhim-data.md)
+  * [Development](guides/development/README.md)
+    * [Config Importing](guides/development/config-importing.md)
 * [Community](community.md)

documentation/cheat-sheet.md

@@ -0,0 +1,65 @@
+---
+description: This page gives a list of common command and examples for easy reference
+---
+
+# 🗒️ Cheat sheet
+
+#### Install the latest Instant OpenHIE binary locally:
+
+```bash
+sudo curl -L https://github.com/openhie/instant-v2/releases/latest/download/instant-linux -o /usr/local/bin/instant
+```
+
+#### Launch a particular package (with metadata initialisation):
+
+```bash
+instant package init -n <package_name>
+```
+
+#### Stop a particular package:
+
+```bash
+instant package down -n <package_name>
+```
+
+#### Start a particular package (WITHOUT metadata initialisation):
+
+```bash
+instant package up -n <package_name>
+```
+
+#### Destroy (delete all data too) a particular package:
+
+```bash
+instant package destroy -n <package_name>
+```
+
+#### Launch a particular recipe (with metadata initialisation) using profiles (which are defined in the config.yaml file):
+
+```bash
+instant package init -p <profile_name>
+```
+
+#### Stop a particular recipe:
+
+```bash
+instant package down -p <profile_name>
+```
+
+#### Start a particular recipe (WITHOUT metadata initialisation):
+
+```bash
+instant package up -p <profile_nameage_name>
+```
+
+#### Destroy (delete all data too) a particular recipe:
+
+```bash
+instant package destroy -p <profile_name>
+```
+
+#### Add --dev to any \`instant\` command to expose development ports to the host for packages
+
+```bash
+instant package init ... --dev
+```

documentation/guides/README.md

@@ -0,0 +1,6 @@
+---
+description: Various notes and guide
+---
+
+# Guides
+

documentation/development/README.md → documentation/guides/development/README.md

@@ -2,7 +2,7 @@
 
 ## Adding Packages
 
-* The Go Cli runs all services from the `jembi/platform` docker image. When adding new packages or updating existing packages to Platform you will need to build/update your local `jembi/platform` image. [How to build the image](<../README (1).md>).
+* The Go Cli runs all services from the `jembi/platform` docker image. When adding new packages or updating existing packages to Platform you will need to build/update your local `jembi/platform` image. [How to build the image](<../../README (1).md>).
 * As you add new packages to the platform remember to list them in the `config.yml` file - otherwise the added package will not be detected by the [platform-cli tool](https://app.gitbook.com/o/lTiMw1wKTVQEjepxV4ou/s/TwrbQZir3ZdvejunAFia/).
 
 ##

documentation/resource-allocations.md → documentation/guides/resource-allocations.md

@@ -20,7 +20,7 @@ As a default, each package contained in Platform is allocated a maximum of 3 GB
 
 ## Allocating Resources per Package
 
-The resource allocation can be set on a per-package basis, as specified by the relevant environment variables found in the relevant [Packages section](packages/).
+The resource allocation can be set on a per-package basis, as specified by the relevant environment variables found in the relevant [Packages section](../packages/).
 
 ## Notes
 

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:3334/jembi-fhir-ig-importer.js",
+  "url": "https://openhimconsole.<domain>/fhir-ig-importer",
   "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": "v1.0.0",
-    "FHIR_IG_IMPORTER_CORE_VERSION": "v1.0.0"
+    "FHIR_IG_IMPORTER_UI_VERSION": "latest",
+    "FHIR_IG_IMPORTER_CORE_VERSION": "latest"
   }
 }

interoperability-layer-openhim/docker-compose.yml

@@ -55,6 +55,8 @@ services:
       KC_FRONTEND_URL: ${KC_FRONTEND_URL}
       OPENHIM_CONSOLE_SHOW_LOGIN: ${OPENHIM_CONSOLE_SHOW_LOGIN}
       REACT_APP_OPENHIM_API_BASE_URL: ${OPENHIM_API_BASE_URL}
+      OPENHIM_API_HOST: ${OPENHIM_API_HOST}
+      OPENHIM_API_PORT: ${OPENHIM_API_PORT}
       NODE_TLS_REJECT_UNAUTHORIZED: 0
     networks:
       reverse-proxy:

interoperability-layer-openhim/package-metadata.json

@@ -43,6 +43,8 @@
     "KC_OPENHIM_CLIENT_SECRET": "tZKfEbWf0Ka5HBNZwFrdSyQH2xT1sNMR",
     "KC_OPENHIM_ROOT_URL": "http://localhost:9000",
     "KC_API_URL": "http://identity-access-manager-keycloak:8080",
-    "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000"
+    "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000",
+    "OPENHIM_API_HOST": "localhost",
+    "OPENHIM_API_PORT": "5001"
   }
 }