Merge pull request #334 from balena-io-modules/ab77/operational

remove self-hosted Sentry config
balena-io-modules · Dec 5, 2023 · d6894ab · d6894ab
2 parents 59dbc1e + 3f39036
commit d6894ab
Showing 1 changed file with 2 additions and 23 deletions.
diff --git a/src/configure-balena.sh b/src/configure-balena.sh
@@ -15,9 +15,8 @@ fi
 ROOT_CA=${ROOT_CA:-$BALENA_ROOT_CA}
 CONF=${CONF:-/balena/${TLD}.env}
 CERTS=${CERTS:-/certs}
-HOSTS_CONFIG=${HOSTS_CONFIG:-ALERTMANAGER_HOST:alertmanager,ADMIN_HOST:admin,API_HOST:api,BUILDER_HOST:builder,DELTA_HOST:delta,DELTA_S3_HOST:s3,DEVICE_URLS_BASE:devices,FILES_HOST:files,GIT_HOST:git,GIT_HOSTNAME:git,IMAGE_MAKER_HOST:img,IMAGE_MAKER_S3_HOST:s3,LOKI_HOST:loki,MONITOR_HOST:monitor,PROXY_HOST:devices,REDIS_HOST:redis,REGISTRY_HOST:registry,REGISTRY2_HOST:registry2,REGISTRY_PROXY_HOST:registry-proxy,SENTRY_DATABASE_HOST:db,SENTRY_REDIS_HOST:redis,SENTRY_URL_HOST:sentry,TOKEN_AUTH_CERT_ISSUER:api,REGISTRY2_TOKEN_AUTH_ISSUER:api,REGISTRY2_TOKEN_AUTH_REALM:api,UI_HOST:dashboard,VPN_HOST:cloudlink,WEBRESOURCES_S3_HOST:s3}
-SENTRY_CONFIG=${SENTRY_CONFIG:-API_SENTRY_DSN:2,DELTA_SENTRY_DSN:4,BUILDER_SENTRY_DSN:5,IMG_SENTRY_DSN:6,PROXY_SENTRY_DSN:7,UI_SENTRY_DSN:8,VPN_SENTRY_DSN:9}
-TOKENS_CONFIG=${TOKENS_CONFIG:-API_SERVICE_API_KEY:hex,AUTH_RESINOS_REGISTRY_CODE:hex,BUILDER_SERVICE_API_KEY:hex,COOKIE_SESSION_SECRET:hex,DELTA_SERVICE_API_KEY:hex,DIGITIZER_API_KEY:hex,GEOIP_LICENCE_KEY:hex,GEOIP_USER_ID:hex,GIT_API_KEY:hex,IMG_S3_ACCESS_KEY:hex,IMG_S3_SECRET_KEY:hex,JF_OAUTH_APP_SECRET:hex,JSON_WEB_TOKEN_SECRET:hex,MAPS_API_KEY:hex,MIXPANEL_TOKEN:hex,MONITOR_OAUTH_COOKIE_SECRET:hex,MONITOR_SECRET_TOKEN:hex,PROXY_SERVICE_API_KEY:hex,REGISTRY2_SECRETKEY:hex,SENTRY_ADMIN_APIKEY:hex,SENTRY_SECRET_KEY:hex,TOKEN_AUTH_BUILDER_TOKEN:hex,VPN_GUEST_API_KEY:hex,VPN_SERVICE_API_KEY:hex,API_VPN_SERVICE_API_KEY:API_SERVICE_API_KEY,DELTA_API_KEY:DELTA_SERVICE_API_KEY,DELTA_S3_KEY:IMG_S3_ACCESS_KEY,DELTA_S3_SECRET:IMG_S3_SECRET_KEY,GIT_SERVICE_API_KEY:GIT_API_KEY,MDNS_API_TOKEN:PROXY_SERVICE_API_KEY,REGISTRY2_TOKEN:TOKEN_AUTH_BUILDER_TOKEN,S3_MINIO_ACCESS_KEY:IMG_S3_ACCESS_KEY,S3_MINIO_SECRET_KEY:IMG_S3_SECRET_KEY,S3_MINIO_ACCESS_KEY:REGISTRY2_S3_KEY,S3_MINIO_SECRET_KEY:REGISTRY2_S3_SECRET,WEBRESOURCES_S3_ACCESS_KEY:IMG_S3_ACCESS_KEY,WEBRESOURCES_S3_SECRET_KEY:IMG_S3_SECRET_KEY}
+HOSTS_CONFIG=${HOSTS_CONFIG:-ALERTMANAGER_HOST:alertmanager,ADMIN_HOST:admin,API_HOST:api,BUILDER_HOST:builder,DELTA_HOST:delta,DELTA_S3_HOST:s3,DEVICE_URLS_BASE:devices,FILES_HOST:files,GIT_HOST:git,GIT_HOSTNAME:git,IMAGE_MAKER_HOST:img,IMAGE_MAKER_S3_HOST:s3,LOKI_HOST:loki,MONITOR_HOST:monitor,PROXY_HOST:devices,REDIS_HOST:redis,REGISTRY_HOST:registry,REGISTRY2_HOST:registry2,REGISTRY_PROXY_HOST:registry-proxy,TOKEN_AUTH_CERT_ISSUER:api,REGISTRY2_TOKEN_AUTH_ISSUER:api,REGISTRY2_TOKEN_AUTH_REALM:api,UI_HOST:dashboard,VPN_HOST:cloudlink,WEBRESOURCES_S3_HOST:s3}
+TOKENS_CONFIG=${TOKENS_CONFIG:-API_SERVICE_API_KEY:hex,AUTH_RESINOS_REGISTRY_CODE:hex,BUILDER_SERVICE_API_KEY:hex,COOKIE_SESSION_SECRET:hex,DELTA_SERVICE_API_KEY:hex,DIGITIZER_API_KEY:hex,GEOIP_LICENCE_KEY:hex,GEOIP_USER_ID:hex,GIT_API_KEY:hex,IMG_S3_ACCESS_KEY:hex,IMG_S3_SECRET_KEY:hex,JF_OAUTH_APP_SECRET:hex,JSON_WEB_TOKEN_SECRET:hex,MAPS_API_KEY:hex,MIXPANEL_TOKEN:hex,MONITOR_OAUTH_COOKIE_SECRET:hex,MONITOR_SECRET_TOKEN:hex,PROXY_SERVICE_API_KEY:hex,REGISTRY2_SECRETKEY:hex,TOKEN_AUTH_BUILDER_TOKEN:hex,VPN_GUEST_API_KEY:hex,VPN_SERVICE_API_KEY:hex,API_VPN_SERVICE_API_KEY:API_SERVICE_API_KEY,DELTA_API_KEY:DELTA_SERVICE_API_KEY,DELTA_S3_KEY:IMG_S3_ACCESS_KEY,DELTA_S3_SECRET:IMG_S3_SECRET_KEY,GIT_SERVICE_API_KEY:GIT_API_KEY,MDNS_API_TOKEN:PROXY_SERVICE_API_KEY,REGISTRY2_TOKEN:TOKEN_AUTH_BUILDER_TOKEN,S3_MINIO_ACCESS_KEY:IMG_S3_ACCESS_KEY,S3_MINIO_SECRET_KEY:IMG_S3_SECRET_KEY,S3_MINIO_ACCESS_KEY:REGISTRY2_S3_KEY,S3_MINIO_SECRET_KEY:REGISTRY2_S3_SECRET,WEBRESOURCES_S3_ACCESS_KEY:IMG_S3_ACCESS_KEY,WEBRESOURCES_S3_SECRET_KEY:IMG_S3_SECRET_KEY}
 
 declare -A HOST_ENVVARS
 hosts_config=($(echo "${HOSTS_CONFIG}" | tr ',' ' '))
@@ -29,16 +28,6 @@ for kv in ${hosts_config[*]}; do
 	fi
 done
 
-declare -A SENTRY_ENVVARS
-sentry_config=($(echo "${SENTRY_CONFIG}" | tr ',' ' '))
-for kv in ${sentry_config[*]}; do
-	varname="$(echo "${kv}" | awk -F':' '{print $1}')"
-	varval="$(echo "${kv}" | awk -F':' '{print $2}')"
-	if [[ -n $varname ]] && [[ -n $varval ]]; then
-		SENTRY_ENVVARS[${varname}]="${varval}"
-	fi
-done
-
 declare -A API_KEYS
 tokens_config=($(echo "${TOKENS_CONFIG}" | tr ',' ' '))
 for kv in ${tokens_config[*]}; do
@@ -350,16 +339,6 @@ if [[ -n "${TLD}" ]]; then
 	  fi
 	done
 
-	# inject Sentry environment variables into stack global environment
-	for VARNAME in "${!SENTRY_ENVVARS[@]}"; do
-		VARVALUE=${!VARNAME}
-		if [[ -z "$VARVALUE" ]]; then
-			SUFFIX="${SENTRY_ENVVARS[${VARNAME}]}"
-			DSN="https://$(openssl rand -hex 16):$(openssl rand -hex 16)@sentry.${TLD}/${SUFFIX}"
-			grep -Eq "^${VARNAME}=" "${CONF}" || echo "${VARNAME}=${DSN}" >> "${CONF}"
-		fi
-	done
-
 	# inject API keys into stack global environment
 	for VARNAME in "${!API_KEYS[@]}"; do
 		VARVALUE="${API_KEYS[${VARNAME}]}"