From 48d9a034c767e8c4ade5ab69d212f313be0b9342 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Tue, 5 Sep 2023 13:05:58 +0200 Subject: [PATCH] Added local bridgehead monitoring --- ccp/docker-compose.yml | 10 ++++++++++ ccp/vars | 1 + 2 files changed, 11 insertions(+) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 5a0db06..06bcaa7 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: ${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,15 @@ 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: 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: diff --git a/ccp/vars b/ccp/vars index 0c80e8a..8c7c78e 100644 --- a/ccp/vars +++ b/ccp/vars @@ -2,6 +2,7 @@ BROKER_ID=broker.ccp-it.dktk.dkfz.de BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" +MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" FOCUS_RETRY_COUNT=32 SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem