Merge branch 'main' into PLAT-346-cluster-logstash

Author: bradsawadye

.env.local

@@ -20,9 +20,9 @@ OPENHIM_MONGO_ATNAURL=mongodb://mongo-1:27017/openhim
 
 # Reverse Proxy - Nginx
 
-REVERSE_PROXY_INSTANCES=3
+REVERSE_PROXY_INSTANCES=1
 INSECURE=true
-INSECURE_PORTS=-5001:5001-80:80-8080:8080-5601:5601-5488:5488
+INSECURE_PORTS=5001:5001-80:80-8080:8080-5601:5601-5488:5488
 DOMAIN_NAME=domain
 SUBDOMAINS=openhimcomms.domain,openhimcore.domain,openhimconsole.domain,kibana.domain,reports.domain
 RENEWAL_EMAIL=dummy@jembi.org

analytics-datastore-elastic-search/docker-compose.cluster.yml

@@ -10,6 +10,7 @@ services:
         soft: -1
         hard: -1
     deploy:
+      replicas: 0
       resources:
         limits:
           memory: ${ES_MEMORY_LIMIT:-3G}
@@ -57,6 +58,7 @@ services:
         soft: -1
         hard: -1
     deploy:
+      replicas: 0
       resources:
         limits:
           memory: ${ES_MEMORY_LIMIT:-3G}
@@ -104,6 +106,7 @@ services:
         soft: -1
         hard: -1
     deploy:
+      replicas: 0
       resources:
         limits:
           memory: ${ES_MEMORY_LIMIT:-3G}

analytics-datastore-elastic-search/swarm.sh

@@ -60,7 +60,7 @@ create_certs() {
   log info "Creating certificates"
   try "docker stack deploy -c $COMPOSE_FILE_PATH/docker-compose.certs.yml instant" "Creating certificates failed"
   docker::await_container_startup create_certs
-  docker::await_container_status create_certs exited
+  docker::await_container_status create_certs Complete
 
   log info "Creating cert helper"
 
@@ -92,20 +92,23 @@ add_docker_configs() {
     --config-add source=${TIMESTAMP}-ca.crt,target=/usr/share/elasticsearch/config/certs/ca/ca.crt \
     --config-add source=${TIMESTAMP}-es01.crt,target=/usr/share/elasticsearch/config/certs/es01/es01.crt \
     --config-add source=${TIMESTAMP}-es01.key,target=/usr/share/elasticsearch/config/certs/es01/es01.key \
+    --replicas 1 \
     instant_analytics-datastore-elastic-search-01" "Error updating es01"
 
   log info "Updating es-02 with certs"
   try "docker service update \
     --config-add source=${TIMESTAMP}-ca.crt,target=/usr/share/elasticsearch/config/certs/ca/ca.crt \
     --config-add source=${TIMESTAMP}-es02.crt,target=/usr/share/elasticsearch/config/certs/es02/es02.crt \
     --config-add source=${TIMESTAMP}-es02.key,target=/usr/share/elasticsearch/config/certs/es02/es02.key \
+    --replicas 1 \
     instant_analytics-datastore-elastic-search-02" "Error updating es02"
 
   log info "Updating es-03 with certs"
   try "docker service update \
     --config-add source=${TIMESTAMP}-ca.crt,target=/usr/share/elasticsearch/config/certs/ca/ca.crt \
     --config-add source=${TIMESTAMP}-es03.crt,target=/usr/share/elasticsearch/config/certs/es03/es03.crt \
     --config-add source=${TIMESTAMP}-es03.key,target=/usr/share/elasticsearch/config/certs/es03/es03.key \
+    --replicas 1 \
     instant_analytics-datastore-elastic-search-03" "Error updating es03"
 }
 
@@ -114,12 +117,15 @@ if [[ "$ACTION" == "init" ]]; then
     create_certs
     try "docker stack deploy -c $COMPOSE_FILE_PATH/docker-compose.cluster.yml instant" "Failed to deploy cluster"
     add_docker_configs
+
+    log info "Waiting for elasticsearch to start before automatically setting built-in passwords"
+    docker::await_container_status $leader_node Running
   else
     try "docker stack deploy -c ${COMPOSE_FILE_PATH}/docker-compose.yml $elastic_search_dev_compose_param instant" "Failed to deploy Analytics Datastore Elastic Search"
-  fi
 
-  log info "Waiting for elasticsearch to start before automatically setting built-in passwords"
-  docker::await_container_status $leader_node running
+    log info "Waiting for elasticsearch to start before automatically setting built-in passwords"
+    docker::await_container_status $leader_node Starting
+  fi
 
   install_expect
   set_elasticsearch_passwords $leader_node
@@ -131,9 +137,11 @@ if [[ "$ACTION" == "init" ]]; then
   log info "Done"
 elif [[ "$ACTION" == "up" ]]; then
   if [[ "$STATEFUL_NODES" == "cluster" ]]; then
-    try "docker stack deploy -c $COMPOSE_FILE_PATH/docker-compose.cluster.yml instant" "Failed to deploy cluster"
+    try "docker service scale instant_analytics-datastore-elastic-search-01=1" "Failed to scale up analytics-datastore-elastic-search-01"
+    try "docker service scale instant_analytics-datastore-elastic-search-02=1" "Failed to scale up analytics-datastore-elastic-search-02"
+    try "docker service scale instant_analytics-datastore-elastic-search-03=1" "Failed to scale up analytics-datastore-elastic-search-03"
   else
-    try "docker stack deploy -c $COMPOSE_FILE_PATH/docker-compose.yml $elastic_search_dev_compose_param instant" "Failed to deploy Analytics Datastore Elastic Search"
+    try "docker service scale instant_analytics-datastore-elastic-search=1" "Failed to scale up analytics-datastore-elastic-search"
   fi
 elif [[ "$ACTION" == "down" ]]; then
   if [[ "$STATEFUL_NODES" == "cluster" ]]; then
@@ -149,14 +157,14 @@ elif [[ "$ACTION" == "destroy" ]]; then
     try "docker service rm instant_analytics-datastore-elastic-search-02" "Failed to remove analytics-datastore-elastic-search-02"
     try "docker service rm instant_analytics-datastore-elastic-search-03" "Failed to remove analytics-datastore-elastic-search-03"
 
-    docker::await_container_destroy analytics-datastore-elastic-search-01
-    docker::await_container_destroy analytics-datastore-elastic-search-02
-    docker::await_container_destroy analytics-datastore-elastic-search-03
+    docker::await_service_destroy analytics-datastore-elastic-search-01
+    docker::await_service_destroy analytics-datastore-elastic-search-02
+    docker::await_service_destroy analytics-datastore-elastic-search-03
 
     log warn "Volumes are only deleted on the host on which the command is run. Elastic Search volumes on other nodes are not deleted"
   else
     try "docker service rm instant_analytics-datastore-elastic-search" "Failed to remove analytics-datastore-elastic-search"
-    docker::await_container_destroy analytics-datastore-elastic-search
+    docker::await_service_destroy analytics-datastore-elastic-search
     try "docker volume rm instant_es-data" "Failed to remove volume instant_es-data"
   fi
 else

client-registry-santempi/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - SDB_DATA_POLICY_RESOURCE=Patient
       - SDB_DELAY_START=5000
     deploy:
-      replicas: ${SANTEMPI_INSTANCES:-1}
+      replicas: ${SANTEMPI_INSTANCES}
   santedb-www:
     image: santesuite/santedb-www:2.2.3
     depends_on:

client-registry-santempi/package-metadata.json

@@ -4,5 +4,7 @@
   "description": "A patient matching and deduplicater for the platform",
   "version": "0.0.1",
   "dependencies": ["reverse-proxy-nginx"],
-  "environmentVariables": {}
+  "environmentVariables": {
+    "SANTEMPI_INSTANCES": "1"
+  }
 }

client-registry-santempi/swarm.sh

@@ -2,7 +2,8 @@
 
 readonly ACTION=$1
 readonly MODE=$2
-
+readonly SANTEMPI_INSTANCES=${SANTEMPI_INSTANCES:-1}
+export SANTEMPI_INSTANCES
 TIMESTAMP="$(date "+%Y%m%d%H%M%S")"
 readonly TIMESTAMP
 

dashboard-visualiser-jsreport/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     deploy:
       placement:
         max_replicas_per_node: 1
-      replicas: ${JS_REPORT_INSTANCES:-1}
+      replicas: ${JS_REPORT_INSTANCES}
       resources:
         limits:
           cpus: ${JS_REPORT_CPU_LIMIT:-0.8}

dashboard-visualiser-jsreport/package-metadata.json

@@ -17,6 +17,7 @@
     "JS_REPORT_CPU_RESERVE": "0.05",
     "JS_REPORT_MEMORY_RESERVE": "500M",
     "JS_REPORT_DEV_MOUNT": "false",
-    "JS_REPORT_PACKAGE_PATH": ""
+    "JS_REPORT_PACKAGE_PATH": "",
+    "JS_REPORT_INSTANCES": "1"
   }
 }

dashboard-visualiser-jsreport/swarm.sh

@@ -2,7 +2,8 @@
 
 readonly ACTION=$1
 readonly MODE=$2
-
+readonly JS_REPORT_INSTANCES=${JS_REPORT_INSTANCES:-1}
+export JS_REPORT_INSTANCES
 TIMESTAMP="$(date "+%Y%m%d%H%M%S")"
 readonly TIMESTAMP
 
@@ -19,14 +20,14 @@ ROOT_PATH="${COMPOSE_FILE_PATH}/.."
 
 configure_nginx() {
   if [[ "${INSECURE}" == "true" ]]; then
-    try "docker config create --label name=nginx ${TIMESTAMP}-http-jsreport-insecure.conf ${COMPOSE_FILE_PATH}/config/http-jsreport-insecure.conf" "Failed to create nginx jsreport insecure config"
+    try "docker config create --label name=nginx http-jsreport-insecure.conf ${COMPOSE_FILE_PATH}/config/http-jsreport-insecure.conf" "Failed to create nginx jsreport insecure config"
     log info "Updating nginx service: adding jsreport config file..."
-    try "docker service update --config-add source=${TIMESTAMP}-http-jsreport-insecure.conf,target=/etc/nginx/conf.d/http-jsreport-insecure.conf instant_reverse-proxy-nginx" "Error updating nginx service"
+    try "docker service update --config-add source=http-jsreport-insecure.conf,target=/etc/nginx/conf.d/http-jsreport-insecure.conf instant_reverse-proxy-nginx" "Error updating nginx service"
     log info "Done updating nginx service"
   else
-    try "docker config create --label name=nginx ${TIMESTAMP}-http-jsreport-secure.conf ${COMPOSE_FILE_PATH}/config/http-jsreport-secure.conf" "Failed to create secure jsreport nginx config"
+    try "docker config create --label name=nginx http-jsreport-secure.conf ${COMPOSE_FILE_PATH}/config/http-jsreport-secure.conf" "Failed to create secure jsreport nginx config"
     log info "Updating nginx service: adding jsreport config file..."
-    try "docker service update --config-add source=${TIMESTAMP}-http-jsreport-secure.conf,target=/etc/nginx/conf.d/http-jsreport-secure.conf instant_reverse-proxy-nginx" "Error updating nginx service"
+    try "docker service update --config-add source=http-jsreport-secure.conf,target=/etc/nginx/conf.d/http-jsreport-secure.conf instant_reverse-proxy-nginx" "Error updating nginx service"
     log info "Done updating nginx service"
   fi
 }
@@ -82,6 +83,7 @@ main() {
     try "docker service scale instant_dashboard-visualiser-jsreport=0" "Failed to scale down dashboard-visualiser-jsreport"
   elif [[ "${ACTION}" == "destroy" ]]; then
     try "docker service rm instant_dashboard-visualiser-jsreport instant_jsreport-config-importer instant_await-helper" "Failed to destroy dashboard-visualiser-jsreport"
+    config::remove_service_nginx_config "http-jsreport-secure.conf" "http-jsreport-insecure.conf"
   else
     log error "Valid options are: init, up, down, or destroy"
   fi

dashboard-visualiser-kibana/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     environment:
       ES_KIBANA_SYSTEM: ${ES_KIBANA_SYSTEM?:err}
     deploy:
-      replicas: ${KIBANA_INSTANCES:-1}
+      replicas: ${KIBANA_INSTANCES}
       resources:
         limits:
           memory: ${KIBANA_MEMORY_LIMIT:-3G}