diff --git a/bbmri/modules/eric-compose.yml b/bbmri/modules/eric-compose.yml index 2bf7dd6a..8300e165 100644 --- a/bbmri/modules/eric-compose.yml +++ b/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: docker.verbis.dkfz.de/cache/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 diff --git a/bbmri/modules/eric-setup.sh b/bbmri/modules/eric-setup.sh index 364281b2..9b100845 100644 --- a/bbmri/modules/eric-setup.sh +++ b/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 diff --git a/bbmri/modules/gbn-compose.yml b/bbmri/modules/gbn-compose.yml index 47b1d36f..2e62ee22 100644 --- a/bbmri/modules/gbn-compose.yml +++ b/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: docker.verbis.dkfz.de/cache/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 + diff --git a/bbmri/modules/gbn-setup.sh b/bbmri/modules/gbn-setup.sh index d3edd740..982579a1 100644 --- a/bbmri/modules/gbn-setup.sh +++ b/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 diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 5a0db068..03e9d834 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -40,6 +40,7 @@ services: BROKER_URL: ${BROKER_URL} PROXY_ID: ${PROXY_ID} APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT} + APP_monitoring_KEY: ${CCP_MONITORING_BEAM_SECRET_SHORT} PRIVKEY_FILE: /run/secrets/proxy.pem ALL_PROXY: http://forward_proxy:3128 TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs @@ -51,6 +52,16 @@ services: volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro + + bridgehead-monitoring: + image: docker.verbis.dkfz.de/cache/samply/bridgehead-monitoring:latest + container_name: bridgehead-monitoring-ccp + environment: + - BEAM_ID=monitoring.${PROXY_ID} + - BEAM_API_KEY=${CCP_MONITORING_BEAM_SECRET_SHORT} + - BEAM_PROXY_URL=http://beam-proxy:8081 + depends_on: + - beam-proxy volumes: diff --git a/ccp/modules/ccp-setup.sh b/ccp/modules/ccp-setup.sh new file mode 100644 index 00000000..fcd20e7d --- /dev/null +++ b/ccp/modules/ccp-setup.sh @@ -0,0 +1,2 @@ +#Monitoring +CCP_MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" \ No newline at end of file