Add monitoring Network to Test Setup

This network contains all agents and their HDSs.

.github/test/compose.yaml

@@ -5,13 +5,14 @@ networks:
   trust-center:
   gics:
   gpas:
+  monitoring:
 
 services:
   # Clinical Domain
   cd-agent:
     image: clinical-domain-agent:latest
     ports: [ ":8080" ]
-    networks: [ "agents", "clinical-domain" ]
+    networks: [ "agents", "clinical-domain", "monitoring" ]
     volumes:
     - ./cd-agent/projects:/app/projects
     - ./deidentifhir/:/app/config/deidentifhir
@@ -27,7 +28,7 @@ services:
   cd-hds:
     image: samply/blaze:0.29.3@sha256:47527f478ef2ddf932f4e5c882c0266ac179d7a2fc37ed66868d079698541da3
     ports: [ ":8080" ]
-    networks: [ "clinical-domain" ]
+    networks: [ "clinical-domain", "monitoring" ]
     environment:
       BASE_URL: "http://cd-hds:8080"
     healthcheck:
@@ -41,7 +42,7 @@ services:
   rd-agent:
     image: research-domain-agent:latest
     ports: [ ":8080" ]
-    networks: [ "agents", "research-domain" ]
+    networks: [ "agents", "research-domain", "monitoring" ]
     volumes:
     - ./rd-agent/projects:/app/projects
     - ./deidentifhir/:/app/config/deidentifhir
@@ -57,7 +58,7 @@ services:
   rd-hds:
     image: samply/blaze:0.29.3@sha256:47527f478ef2ddf932f4e5c882c0266ac179d7a2fc37ed66868d079698541da3
     ports: [ ":8080" ]
-    networks: [ "research-domain" ]
+    networks: [ "research-domain", "monitoring" ]
     environment:
       BASE_URL: "http://rd-hds:8080"
       ENFORCE_REFERENTIAL_INTEGRITY: "false"
@@ -72,7 +73,7 @@ services:
   tc-agent:
     image: trust-center-agent:latest
     ports: [ ":8080" ]
-    networks: [ "agents", "trust-center" ]
+    networks: [ "agents", "trust-center", "monitoring" ]
     depends_on:
       keystore:
         condition: service_started

monitoring/README.md

@@ -1,7 +1,9 @@
 # Monitoring-Util
 
-This module contains an example configuration to utilize Prometheus to collect metrics from CDA, RDA, and TCA and
-visualize them with Grafana.
+This module contains an example configuration to utilize Prometheus to collect metrics from
+CDA, RDA, and TCA and visualize them with Grafana.
 
 When using `compose.yaml`make sure to set the NETWORK_NAME environment variable to the same network
-of CDA, RDA, and TCA, e.g. `test_agents`, if you are running tests in `.github/test`.
+of CDA, RDA, and TCA, e.g. `test_monitoring`, if you are running tests in `.github/test`.
+For developer convenience, we set `test_monitoring` as the default.
+``

monitoring/compose.yaml

@@ -24,5 +24,5 @@ services:
     networks: [ "fts" ]
 networks:
   fts:
-    name: ${NETWORK_NAME:-fts-smith-care}
+    name: ${NETWORK_NAME:-test_monitoring}
     external: true