diff --git a/backend/.profile b/backend/.profile index fc2df6596a..f3d33025ec 100644 --- a/backend/.profile +++ b/backend/.profile @@ -19,7 +19,8 @@ export no_proxy="${S3_ENDPOINT_FOR_NO_PROXY},${S3_FIPS_ENDPOINT_FOR_NO_PROXY},${ export NEW_RELIC_LICENSE_KEY="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "newrelic-creds" ".[][] | select(.name == \$service_name) | .credentials.NEW_RELIC_LICENSE_KEY")" # Set the application name for New Relic telemetry. -export NEW_RELIC_APP_NAME="$(echo "$VCAP_APPLICATION" | jq -r .application_name)" +#export NEW_RELIC_APP_NAME="$(echo "$VCAP_APPLICATION" | jq -r .application_name)" +export NEW_RELIC_APP_NAME="$(echo "$VCAP_APPLICATION" | jq -r .application_name)-app" # Set the environment name for New Relic telemetry. export NEW_RELIC_ENVIRONMENT="$(echo "$VCAP_APPLICATION" | jq -r .space_name)" @@ -28,19 +29,20 @@ export NEW_RELIC_ENVIRONMENT="$(echo "$VCAP_APPLICATION" | jq -r .space_name)" export NEW_RELIC_LOG=stdout # Logging level, (critical, error, warning, info and debug). Default to info -export NEW_RELIC_LOG_LEVEL=error +export NEW_RELIC_LOG_LEVEL=info # https://docs.newrelic.com/docs/security/security-privacy/compliance/fedramp-compliant-endpoints/ export NEW_RELIC_HOST="gov-collector.newrelic.com" # https://docs.newrelic.com/docs/apm/agents/python-agent/configuration/python-agent-configuration/#proxy -https_proxy_protocol="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.protocol")" -https_proxy_domain="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.domain")" -https_proxy_port="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.port")" +#https_proxy_protocol="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.protocol")" +#https_proxy_domain="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.domain")" +#https_proxy_port="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.port")" -export NEW_RELIC_PROXY_HOST="$https_proxy_protocol://$https_proxy_domain" -export NEW_RELIC_PROXY_PORT="$https_proxy_port" -export NEW_RELIC_PROXY_USER="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.username")" -export NEW_RELIC_PROXY_PASS="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.password")" +#export NEW_RELIC_PROXY_SCHEME="$https_proxy_protocol" +#export NEW_RELIC_PROXY_HOST="$https_proxy_domain" +#export NEW_RELIC_PROXY_PORT="$https_proxy_port" +#export NEW_RELIC_PROXY_USER="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.username")" +#export NEW_RELIC_PROXY_PASS="$(echo "$VCAP_SERVICES" | jq --raw-output --arg service_name "https-proxy-creds" ".[][] | select(.name == \$service_name) | .credentials.password")" # We only want to run migrate and collecstatic for the first app instance, not # for additional app instances, so we gate all of this behind CF_INSTANCE_INDEX