Improve Monitoring

.github/test/compose.yaml

@@ -1,3 +1,5 @@
+name: fts-test
+
 networks:
   agents:
   clinical-domain:

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

@@ -8,7 +8,7 @@ services:
     command:
     - --enable-feature=native-histograms
     - --config.file=/prometheus.yml
-    networks: [ "fts" ]
+    networks: [ "monitoring", "clinical-domain", "research-domain", "trust-center" ]
     ports:
     - :9090
 
@@ -21,8 +21,15 @@ services:
     - ./grafana/grafana.ini:/etc/grafana/grafana.ini
     ports:
     - 42128:3000
-    networks: [ "fts" ]
+    networks: [ "monitoring" ]
 networks:
-  fts:
-    name: ${NETWORK_NAME:-fts-smith-care}
+  monitoring:
+  clinical-domain:
     external: true
+    name: fts-test_clinical-domain
+  research-domain:
+    external: true
+    name: fts-test_research-domain
+  trust-center:
+    external: true
+    name: fts-test_trust-center

monitoring/grafana/dashboards.yaml

@@ -6,6 +6,11 @@ providers:
     options:
       path: /etc/grafana/dashboards/http-requests.json
 
+  - name: 'Blaze'
+    type: file
+    options:
+      path: /etc/grafana/dashboards/blaze.json
+
   - name: 'HTTP Requests Retries'
     type: file
     options: