From 48d9a034c767e8c4ade5ab69d212f313be0b9342 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Tue, 5 Sep 2023 13:05:58 +0200 Subject: [PATCH 1/5] 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 5a0db068..06bcaa78 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 0c80e8a9..8c7c78e4 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 From 6fa587fe4f7634996489945c2d2f00e1aedce394 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Tue, 5 Sep 2023 14:40:46 +0200 Subject: [PATCH 2/5] Added component monitoring for bbmri --- bbmri/docker-compose.yml | 9 +++++++++ bbmri/vars | 1 + 2 files changed, 10 insertions(+) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index 9bc05cc4..13c2b773 100644 --- a/bbmri/docker-compose.yml +++ b/bbmri/docker-compose.yml @@ -20,6 +20,15 @@ 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: diff --git a/bbmri/vars b/bbmri/vars index 1cb61288..59bba8f2 100644 --- a/bbmri/vars +++ b/bbmri/vars @@ -6,6 +6,7 @@ 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 From 4537617cd0f9c405709d68f808dbb1a94c5eaf70 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Thu, 7 Sep 2023 08:16:47 +0200 Subject: [PATCH 3/5] Added container name for monitoring apps and moved them into respective compose files --- bbmri/docker-compose.yml | 9 --------- bbmri/modules/eric-compose.yml | 10 ++++++++++ bbmri/modules/eric-setup.sh | 3 +++ bbmri/modules/gbn-compose.yml | 11 +++++++++++ bbmri/modules/gbn-setup.sh | 3 +++ bbmri/vars | 1 - ccp/docker-compose.yml | 1 + 7 files changed, 28 insertions(+), 10 deletions(-) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index 13c2b773..9bc05cc4 100644 --- a/bbmri/docker-compose.yml +++ b/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: diff --git a/bbmri/modules/eric-compose.yml b/bbmri/modules/eric-compose.yml index 2bf7dd6a..1f6c0aba 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: 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..1b42ba61 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: 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/bbmri/vars b/bbmri/vars index 59bba8f2..1cb61288 100644 --- a/bbmri/vars +++ b/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 diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 06bcaa78..438c1fdd 100644 --- a/ccp/docker-compose.yml +++ b/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} From d832cfdd436649d0292c472a59e0b140b722efeb Mon Sep 17 00:00:00 2001 From: Jan <59206115+Threated@users.noreply.github.com> Date: Wed, 14 Feb 2024 10:08:34 +0100 Subject: [PATCH 4/5] Use harbor images Co-authored-by: Martin Lablans <6804500+lablans@users.noreply.github.com> --- bbmri/modules/eric-compose.yml | 2 +- bbmri/modules/gbn-compose.yml | 2 +- ccp/docker-compose.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bbmri/modules/eric-compose.yml b/bbmri/modules/eric-compose.yml index 1f6c0aba..8300e165 100644 --- a/bbmri/modules/eric-compose.yml +++ b/bbmri/modules/eric-compose.yml @@ -36,7 +36,7 @@ services: - /srv/docker/bridgehead/bbmri/modules/eric.root.crt.pem:/conf/root.crt.pem:ro bridgehead-monitoring: - image: samply/bridgehead-monitoring:latest + image: docker.verbis.dkfz.de/cache/samply/bridgehead-monitoring:latest container_name: bridgehead-monitoring-eric environment: - BEAM_ID=monitoring.${ERIC_PROXY_ID} diff --git a/bbmri/modules/gbn-compose.yml b/bbmri/modules/gbn-compose.yml index 1b42ba61..2e62ee22 100644 --- a/bbmri/modules/gbn-compose.yml +++ b/bbmri/modules/gbn-compose.yml @@ -36,7 +36,7 @@ services: - /srv/docker/bridgehead/bbmri/modules/gbn.root.crt.pem:/conf/root.crt.pem:ro bridgehead-monitoring: - image: samply/bridgehead-monitoring:latest + image: docker.verbis.dkfz.de/cache/samply/bridgehead-monitoring:latest container_name: bridgehead-monitoring-gbn environment: - BEAM_ID=monitoring.${GBN_PROXY_ID} diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 438c1fdd..24046f54 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -54,8 +54,8 @@ services: - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro bridgehead-monitoring: - image: samply/bridgehead-monitoring:latest - container_name: 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=${MONITORING_BEAM_SECRET_SHORT} From 7837d3b542df8aca6163d72652c141662550493a Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Wed, 14 Feb 2024 11:50:31 +0100 Subject: [PATCH 5/5] Make config consistent across projects --- ccp/docker-compose.yml | 4 ++-- ccp/modules/ccp-setup.sh | 2 ++ ccp/vars | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 ccp/modules/ccp-setup.sh diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 24046f54..03e9d834 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -40,7 +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} + 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 @@ -58,7 +58,7 @@ services: container_name: bridgehead-monitoring-ccp environment: - BEAM_ID=monitoring.${PROXY_ID} - - BEAM_API_KEY=${MONITORING_BEAM_SECRET_SHORT} + - BEAM_API_KEY=${CCP_MONITORING_BEAM_SECRET_SHORT} - BEAM_PROXY_URL=http://beam-proxy:8081 depends_on: - beam-proxy 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 diff --git a/ccp/vars b/ccp/vars index 8c7c78e4..0c80e8a9 100644 --- a/ccp/vars +++ b/ccp/vars @@ -2,7 +2,6 @@ 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