Merge pull request #179 from jembi/PLAT-620-add-jempi-services

PLAT-620 Add JeMPI services
jembi · Nov 29, 2022 · 62e8a52 · 62e8a52
2 parents 1341263 + 0ece303
commit 62e8a52
Show file tree

Hide file tree

Showing 14 changed files with 255 additions and 95 deletions.
diff --git a/client-registry-jempi/docker-compose.api-dev.yml b/client-registry-jempi/docker-compose.api-dev.yml
@@ -0,0 +1,9 @@
+version: '3.9'
+
+services:
+  jempi-api:
+    ports:
+      - published: 50000
+        target: 50000
+        protocol: tcp
+        mode: host
diff --git a/client-registry-jempi/docker-compose.api.yml b/client-registry-jempi/docker-compose.api.yml
@@ -0,0 +1,12 @@
+version: '3.9'
+
+services:
+  jempi-api:
+    image: jembi/jempi-api:${JEMPI_API_IMAGE_TAG}
+    deploy:
+      replicas: 1
+      resources:
+        limits:
+          memory: ${JEMPI_API_MEMORY_LIMIT}
+        reservations:
+          memory: ${JEMPI_API_MEMORY_RESERVE}
diff --git a/client-registry-jempi/docker-compose.combined-dev.yml b/client-registry-jempi/docker-compose.combined-dev.yml
@@ -0,0 +1,23 @@
+version: '3.9'
+
+services:
+  jempi-sync-receiver:
+    ports:
+      - published: 50040
+        target: 50000
+        protocol: tcp
+        mode: host
+
+  jempi-controller:
+    ports:
+      - published: 50020
+        target: 50000
+        protocol: tcp
+        mode: host
+
+  jempi-linker:
+    ports:
+      - published: 50010
+        target: 50000
+        protocol: tcp
+        mode: host
diff --git a/client-registry-jempi/docker-compose.combined.yml b/client-registry-jempi/docker-compose.combined.yml
@@ -0,0 +1,62 @@
+version: '3.9'
+
+services:
+  jempi-async-receiver:
+    image: jembi/jempi-async-receiver:${JEMPI_AJEMPI_SYNC_RECEIVER_IMAGE_TAG}
+    deploy:
+      replicas: 1
+      resources:
+        limits:
+          memory: ${JEMPI_ASYNC_RECEIVER_MEMORY_LIMIT}
+        reservations:
+          memory: ${JEMPI_ASYNC_RECEIVER_MEMORY_RESERVE}
+
+  jempi-sync-receiver:
+    image: jembi/jempi-sync-receiver:${JEMPI_SYNC_RECEIVER_IMAGE_TAG}
+    deploy:
+      replicas: 1
+      resources:
+        limits:
+          memory: ${JEMPI_SYNC_RECEIVER_MEMORY_LIMIT}
+        reservations:
+          memory: ${JEMPI_SYNC_RECEIVER_MEMORY_RESERVE}
+
+  jempi-pre-processor:
+    image: jembi/jempi-pre-processor:${JEMPI_PRE_PROCESSOR_IMAGE_TAG}
+    deploy:
+      replicas: 1
+      resources:
+        limits:
+          memory: ${JEMPI_PRE_PROCESSOR_MEMORY_LIMIT}
+        reservations:
+          memory: ${JEMPI_PRE_PROCESSOR_MEMORY_RESERVE}
+
+  jempi-controller:
+    image: jembi/jempi-controller:${JEMPI_CONTROLLER_IMAGE_TAG}
+    deploy:
+      replicas: 1
+      resources:
+        limits:
+          memory: ${JEMPI_CONTROLLER_MEMORY_LIMIT}
+        reservations:
+          memory: ${JEMPI_CONTROLLER_MEMORY_RESERVE}
+
+  jempi-em-calculator:
+    image: jembi/jempi-em-calculator:${JEMPI_EM_CALCULATOR_IMAGE_TAG}
+    deploy:
+      replicas: 1
+      resources:
+        limits:
+          memory: ${JEMPI_EM_CALCULATOR_MEMORY_LIMIT}
+        reservations:
+          memory: ${JEMPI_EM_CALCULATOR_MEMORY_RESERVE}
+
+  jempi-linker:
+    image: jembi/jempi-linker:${JEMPI_LINKER_IMAGE_TAG}
+    deploy:
+      replicas: 1
+      resources:
+        limits:
+          memory: ${JEMPI_LINKER_MEMORY_LIMIT}
+        reservations:
+          memory: ${JEMPI_LINKER_MEMORY_RESERVE}
diff --git a/client-registry-jempi/docker-compose.dgraph-cluster.yml b/client-registry-jempi/docker-compose.dgraph-cluster.yml
@@ -1,12 +1,6 @@
 version: '3.9'
 
 services:
-  jempi-zero-01:
-    deploy:
-      placement:
-        constraints:
-          - node.hostname == node-1
-
   jempi-alpha-01:
     deploy:
       placement:

diff --git a/client-registry-jempi/docker-compose.dgraph-dev.yml b/client-registry-jempi/docker-compose.dgraph-dev.yml
@@ -1,17 +1,6 @@
 version: '3.9'
 
 services:
-  jempi-zero-01:
-    ports:
-      - published: 5080
-        target: 5080
-        protocol: tcp
-        mode: host
-      - published: 6080
-        target: 6080
-        protocol: tcp
-        mode: host
-
   jempi-alpha-01:
     ports:
       - published: 8070
@@ -45,7 +34,7 @@ services:
         protocol: tcp
         mode: host
 
-  ratel:
+  jempi-ratel:
     ports:
       - published: 8010
         target: 8000

diff --git a/client-registry-jempi/docker-compose.dgraph-zero-cluster.yml b/client-registry-jempi/docker-compose.dgraph-zero-cluster.yml
@@ -0,0 +1,8 @@
+version: '3.9'
+
+services:
+  jempi-zero-01:
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == node-1
diff --git a/client-registry-jempi/docker-compose.dgraph-zero-dev.yml b/client-registry-jempi/docker-compose.dgraph-zero-dev.yml
@@ -0,0 +1,13 @@
+version: '3.9'
+
+services:
+  jempi-zero-01:
+    ports:
+      - published: 5080
+        target: 5080
+        protocol: tcp
+        mode: host
+      - published: 6080
+        target: 6080
+        protocol: tcp
+        mode: host
diff --git a/client-registry-jempi/docker-compose.dgraph-zero.yml b/client-registry-jempi/docker-compose.dgraph-zero.yml
@@ -0,0 +1,22 @@
+version: '3.9'
+
+services:
+  jempi-zero-01:
+    image: dgraph/dgraph:v22.0.0
+    volumes:
+      - jempi-zero-01-data:/dgraph
+    deploy:
+      replicas: 1
+      resources:
+        limits:
+          memory: ${JEMPI_ZERO_01_MEMORY_LIMIT}
+        reservations:
+          memory: ${JEMPI_ZERO_01_MEMORY_RESERVE}
+      restart_policy:
+        condition: on-failure
+    command: dgraph zero --my=jempi-zero-01:5080 --replicas 1
+
+volumes:
+  jempi-zero-01-data:
+
+
diff --git a/client-registry-jempi/docker-compose.dgraph.yml b/client-registry-jempi/docker-compose.dgraph.yml
@@ -1,21 +1,6 @@
 version: '3.9'
 
 services:
-  jempi-zero-01:
-    image: dgraph/dgraph:v22.0.0
-    volumes:
-      - jempi-zero-01-data:/dgraph
-    deploy:
-      replicas: 1
-      resources:
-        limits:
-          memory: ${ZERO_01_MEMORY_LIMIT}
-        reservations:
-          memory: ${ZERO_01_MEMORY_RESERVE}
-      restart_policy:
-        condition: on-failure
-    command: dgraph zero --my=jempi-zero-01:5080 --replicas 1
-
   jempi-alpha-01:
     image: dgraph/dgraph:v22.0.0
     volumes:
@@ -24,9 +9,9 @@ services:
       replicas: 1
       resources:
         limits:
-          memory: ${ALPHA_01_MEMORY_LIMIT}
+          memory: ${JEMPI_ALPHA_01_MEMORY_LIMIT}
         reservations:
-          memory: ${ALPHA_01_MEMORY_RESERVE}
+          memory: ${JEMPI_ALPHA_01_MEMORY_RESERVE}
       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;"
@@ -39,9 +24,9 @@ services:
       replicas: 1
       resources:
         limits:
-          memory: ${ALPHA_02_MEMORY_LIMIT}
+          memory: ${JEMPI_ALPHA_02_MEMORY_LIMIT}
         reservations:
-          memory: ${ALPHA_02_MEMORY_RESERVE}
+          memory: ${JEMPI_ALPHA_02_MEMORY_RESERVE}
       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;"
@@ -54,9 +39,9 @@ services:
       replicas: 1
       resources:
         limits:
-          memory: ${ALPHA_03_MEMORY_LIMIT}
+          memory: ${JEMPI_ALPHA_03_MEMORY_LIMIT}
         reservations:
-          memory: ${ALPHA_03_MEMORY_RESERVE}
+          memory: ${JEMPI_ALPHA_03_MEMORY_RESERVE}
       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;"
@@ -67,15 +52,14 @@ services:
       replicas: 1
       resources:
         limits:
-          memory: ${RATEL_MEMORY_LIMIT}
+          memory: ${JEMPI_RATEL_MEMORY_LIMIT}
         reservations:
-          memory: ${RATEL_MEMORY_RESERVE}
+          memory: ${JEMPI_RATEL_MEMORY_RESERVE}
       restart_policy:
         condition: on-failure
     command: dgraph-ratel
 
 volumes:
-  jempi-zero-01-data:
   jempi-alpha-01-data:
   jempi-alpha-02-data:
   jempi-alpha-03-data:
diff --git a/client-registry-jempi/docker-compose.kafka.yml b/client-registry-jempi/docker-compose.kafka.yml
@@ -23,9 +23,9 @@ services:
       replicas: 1
       resources:
         limits:
-          memory: ${KAFKA_01_MEMORY_LIMIT}
+          memory: ${JEMPI_KAFKA_01_MEMORY_LIMIT}
         reservations:
-          memory: ${KAFKA_01_MEMORY_RESERVE}
+          memory: ${JEMPI_KAFKA_01_MEMORY_RESERVE}
       restart_policy:
         condition: on-failure
 
@@ -51,9 +51,9 @@ services:
       replicas: 1
       resources:
         limits:
-          memory: ${KAFKA_02_MEMORY_LIMIT}
+          memory: ${JEMPI_KAFKA_02_MEMORY_LIMIT}
         reservations:
-          memory: ${KAFKA_02_MEMORY_RESERVE}
+          memory: ${JEMPI_KAFKA_02_MEMORY_RESERVE}
       restart_policy:
         condition: on-failure
 
@@ -79,9 +79,9 @@ services:
       replicas: 1
       resources:
         limits:
-          memory: ${KAFKA_03_MEMORY_LIMIT}
+          memory: ${JEMPI_KAFKA_03_MEMORY_LIMIT}
         reservations:
-          memory: ${KAFKA_03_MEMORY_RESERVE}
+          memory: ${JEMPI_KAFKA_03_MEMORY_RESERVE}
       restart_policy:
         condition: on-failure
 

diff --git a/client-registry-jempi/package-metadata.json b/client-registry-jempi/package-metadata.json
@@ -7,27 +7,48 @@
   "dependencies": [],
   "environmentVariables": {
     "STATEFUL_NODES": "single",
-    "KAFKA_01_MEMORY_LIMIT": "3G",
-    "KAFKA_01_MEMORY_RESERVE": "500M",
-    "KAFKA_02_MEMORY_LIMIT": "3G",
-    "KAFKA_02_MEMORY_RESERVE": "500M",
-    "KAFKA_03_MEMORY_LIMIT": "3G",
-    "KAFKA_03_MEMORY_RESERVE": "500M",
+    "JEMPI_KAFKA_01_MEMORY_LIMIT": "3G",
+    "JEMPI_KAFKA_01_MEMORY_RESERVE": "500M",
+    "JEMPI_KAFKA_02_MEMORY_LIMIT": "3G",
+    "JEMPI_KAFKA_02_MEMORY_RESERVE": "500M",
+    "JEMPI_KAFKA_03_MEMORY_LIMIT": "3G",
+    "JEMPI_KAFKA_03_MEMORY_RESERVE": "500M",
     "JEMPI_KAFDROP_CPU_LIMIT": "0",
     "JEMPI_KAFDROP_CPU_RESERVE": "0.05",
     "JEMPI_KAFDROP_MEMORY_LIMIT": "3G",
     "JEMPI_KAFDROP_MEMORY_RESERVE": "500M",
-    "JEMPI_KAFKA_TOPICS": "jempi-patient-staging-01,jempi-patient-staging-02,jempi-patient-staging-disi,jempi-patient-controller,jempi-patient-em,jempi-patient-linker,jempi-mu-linker,jempi-journal,jempi-notifications",
+    "JEMPI_ZERO_01_MEMORY_LIMIT": "3G",
+    "JEMPI_ZERO_01_MEMORY_RESERVE": "500M",
+    "JEMPI_ALPHA_01_MEMORY_LIMIT": "3G",
+    "JEMPI_ALPHA_01_MEMORY_RESERVE": "500M",
+    "JEMPI_ALPHA_02_MEMORY_LIMIT": "3G",
+    "JEMPI_ALPHA_02_MEMORY_RESERVE": "500M",
+    "JEMPI_ALPHA_03_MEMORY_LIMIT": "3G",
+    "JEMPI_ALPHA_03_MEMORY_RESERVE": "500M",
+    "JEMPI_RATEL_MEMORY_LIMIT": "3G",
+    "JEMPI_RATEL_MEMORY_RESERVE": "500M",
+    "JEMPI_ASYNC_RECEIVER_MEMORY_LIMIT": "3G",
+    "JEMPI_ASYNC_RECEIVER_MEMORY_RESERVE": "500M",
+    "JEMPI_EM_CALCULATOR_MEMORY_LIMIT": "3G",
+    "JEMPI_EM_CALCULATOR_MEMORY_RESERVE": "500M",
+    "JEMPI_CONTROLLER_MEMORY_LIMIT": "3G",
+    "JEMPI_CONTROLLER_MEMORY_RESERVE": "500M",
+    "JEMPI_LINKER_MEMORY_LIMIT": "3G",
+    "JEMPI_LINKER_MEMORY_RESERVE": "500M",
+    "JEMPI_PRE_PROCESSOR_MEMORY_LIMIT": "3G",
+    "JEMPI_PRE_PROCESSOR_MEMORY_RESERVE": "500M",
+    "JEMPI_SYNC_RECEIVER_MEMORY_LIMIT": "3G",
+    "JEMPI_SYNC_RECEIVER_MEMORY_RESERVE": "500M",
+    "JEMPI_API_MEMORY_LIMIT": "3G",
+    "JEMPI_API_MEMORY_RESERVE": "500M",
+    "JEMPI_KAFKA_TOPICS": "JeMPI-async-preprocessor,JeMPI-patient-controller,JeMPI-patient-em,JeMPI-patient-linker,JeMPI-mu-linker,JeMPI-notifications",
     "JEMPI_KAFKA_DEBUG": false,
-    "ZERO_01_MEMORY_LIMIT": "3G",
-    "ZERO_01_MEMORY_RESERVE": "500M",
-    "ALPHA_01_MEMORY_LIMIT": "3G",
-    "ALPHA_01_MEMORY_RESERVE": "500M",
-    "ALPHA_02_MEMORY_LIMIT": "3G",
-    "ALPHA_02_MEMORY_RESERVE": "500M",
-    "ALPHA_03_MEMORY_LIMIT": "3G",
-    "ALPHA_03_MEMORY_RESERVE": "500M",
-    "RATEL_MEMORY_LIMIT": "3G",
-    "RATEL_MEMORY_RESERVE": "500M"
+    "JEMPI_AJEMPI_SYNC_RECEIVER_IMAGE_TAG": "0.1.0",
+    "JEMPI_SYNC_RECEIVER_IMAGE_TAG": "0.1.0",
+    "JEMPI_PRE_PROCESSOR_IMAGE_TAG": "0.1.0",
+    "JEMPI_CONTROLLER_IMAGE_TAG": "0.1.0",
+    "JEMPI_EM_CALCULATOR_IMAGE_TAG": "0.1.0",
+    "JEMPI_LINKER_IMAGE_TAG": "0.1.0",
+    "JEMPI_API_IMAGE_TAG": "0.1.0"
   }
 }