Added container name for monitoring apps and moved them into respective compose files

bbmri/docker-compose.yml

@@ -20,15 +20,6 @@ services:
       - "traefik.http.services.blaze_ccp.loadbalancer.server.port=8080"
       - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,auth"
       - "traefik.http.routers.blaze_ccp.tls=true"
-  
-  bridgehead-monitoring:
-    image: samply/bridgehead-monitoring:latest
-    environment:
-      - BEAM_ID=monitoring.${PROXY_ID}
-      - BEAM_API_KEY=${MONITORING_BEAM_SECRET_SHORT}
-      - BEAM_PROXY_URL=http://beam-proxy:8081
-    depends_on:
-      - beam-proxy
 
 volumes:
   blaze-data:

bbmri/modules/eric-compose.yml

@@ -22,6 +22,7 @@ services:
       BROKER_URL: ${ERIC_BROKER_URL}
       PROXY_ID: ${ERIC_PROXY_ID}
       APP_focus_KEY: ${ERIC_FOCUS_BEAM_SECRET_SHORT}
+      APP_monitoring_KEY: ${ERIC_MONITORING_BEAM_SECRET_SHORT}
       PRIVKEY_FILE: /run/secrets/proxy.pem
       ALL_PROXY: http://forward_proxy:3128
       TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
@@ -34,3 +35,12 @@ services:
       - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
       - /srv/docker/bridgehead/bbmri/modules/eric.root.crt.pem:/conf/root.crt.pem:ro
 
+  bridgehead-monitoring:
+    image: samply/bridgehead-monitoring:latest
+    container_name: bridgehead-monitoring-eric
+    environment:
+      - BEAM_ID=monitoring.${ERIC_PROXY_ID}
+      - BEAM_API_KEY=${ERIC_MONITORING_BEAM_SECRET_SHORT}
+      - BEAM_PROXY_URL=http://beam-proxy-eric:8081
+    depends_on:
+      - beam-proxy-eric

bbmri/modules/eric-setup.sh

@@ -10,4 +10,7 @@ if [ "${ENABLE_ERIC}" == "true" ]; then
 	ERIC_PROXY_ID=${SITE_ID}.${ERIC_BROKER_ID}
 	ERIC_FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
 	ERIC_SUPPORT_EMAIL=bridgehead@helpdesk.bbmri-eric.eu
+
+	#Monitoring
+	ERIC_MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
 fi

bbmri/modules/gbn-compose.yml

@@ -22,6 +22,7 @@ services:
       BROKER_URL: ${GBN_BROKER_URL}
       PROXY_ID: ${GBN_PROXY_ID}
       APP_focus_KEY: ${GBN_FOCUS_BEAM_SECRET_SHORT}
+      APP_monitoring_KEY: ${GBN_MONITORING_BEAM_SECRET_SHORT}
       PRIVKEY_FILE: /run/secrets/proxy.pem
       ALL_PROXY: http://forward_proxy:3128
       TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
@@ -34,3 +35,13 @@ services:
       - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
       - /srv/docker/bridgehead/bbmri/modules/gbn.root.crt.pem:/conf/root.crt.pem:ro
 
+  bridgehead-monitoring:
+    image: samply/bridgehead-monitoring:latest
+    container_name: bridgehead-monitoring-gbn
+    environment:
+      - BEAM_ID=monitoring.${GBN_PROXY_ID}
+      - BEAM_API_KEY=${GBN_MONITORING_BEAM_SECRET_SHORT}
+      - BEAM_PROXY_URL=http://beam-proxy-gbn:8081
+    depends_on:
+      - beam-proxy-gbn
+

bbmri/modules/gbn-setup.sh

@@ -10,4 +10,7 @@ if [ "${ENABLE_GBN}" == "true" ]; then
 	GBN_PROXY_ID=${SITE_ID}.${GBN_BROKER_ID}
 	GBN_FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
 	GBN_SUPPORT_EMAIL=feedback@germanbiobanknode.de
+
+	#Monitoring
+	GBN_MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
 fi

bbmri/vars

@@ -6,7 +6,6 @@
 
 FOCUS_RETRY_COUNT=32
 PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem
-MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
 
 for module in $PROJECT/modules/*.sh
 do

ccp/docker-compose.yml

@@ -55,6 +55,7 @@ services:
   
   bridgehead-monitoring:
     image: samply/bridgehead-monitoring:latest
+    container_name: bridgehead-monitoring
     environment:
       - BEAM_ID=monitoring.${PROXY_ID}
       - BEAM_API_KEY=${MONITORING_BEAM_SECRET_SHORT}