Skip to content

Commit

Permalink
remove: new relic
Browse files Browse the repository at this point in the history
- we cannot find any current usage of new relic integration,
hence it is planned to be removed in the next UAA major
release (see: #739)
- removing it reduces false positives in CVE scanning and reduces
the bosh release size

[#186179693]

Co-authored-by: Alicia Yingling <alicia.yingling@broadcom.com>
  • Loading branch information
peterhaochen47 and Tallicia committed Jan 25, 2024
1 parent 4bac5be commit a807c1c
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 53 deletions.
4 changes: 0 additions & 4 deletions config/blobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,3 @@ uaa/apache-tomcat-9.0.85.tar.gz:
size: 11809177
object_id: edc29a07-7402-4cb5-4629-f9a4fdeceb6c
sha: sha256:a1874d5e2e72003a81276e5a9520004aca113f135fc841334229b68f6d25ba1e
uaa/newrelic.jar:
size: 38223008
object_id: 21540bf5-22c0-47d4-6c60-3aec6607aa0a
sha: sha256:b51f4c960a8007f8b6fb4299d2177d0f37840e155aecd4603558fbb5377e8282
16 changes: 0 additions & 16 deletions jobs/uaa/spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ description: "The UAA is the identity management service for Cloud Foundry. It's

templates:
bin/uaa: bin/uaa
bin/configure_newrelic.erb: bin/configure_newrelic
bin/configure_proxy.erb: bin/configure_proxy
bin/health_check.erb: bin/health_check
bin/pre-start.erb: bin/pre-start
Expand All @@ -14,7 +13,6 @@ templates:

config/uaa.yml.erb: config/uaa.yml
config/bpm.yml.erb: config/bpm.yml
config/newrelic.yml.erb: config/newrelic.yml
config/log4j2.properties.erb: config/log4j2.properties
config/ldap.crt.erb: config/ldap.crt
config/messages.properties.erb: config/messages.properties
Expand Down Expand Up @@ -181,20 +179,6 @@ properties:
uaa.proxy.servers:
description: "Array of the router IPs acting as the first group of HTTP/TCP backends. These will be added to the proxy_ips_regex as exact matches."
default: []
uaa.newrelic:
description: |
To enable newrelic monitoring, the sub element of this property will be placed in
a configuration file called newrelic.yml in the jobs config directory.
The syntax that must adhere to documentation in https://docs.newrelic.com/docs/agents/java-agent/configuration/java-agent-configuration-config-file
The JVM option -javaagent:/path/to/newrelic.jar will be added to Apache Tomcat's startup script
The enablement of the NewRelic agent in the UAA is triggered by the property uaa.newrelic.common.license_key
The property uaa.newrelic.common.license_key must be set.
example: |
uaa:
newrelic:
common:
app_name: ((uaa_app_name))
license_key: ((uaa_license_key))

env.http_proxy:
description: "The http_proxy across the VMs used for all requests over http"
Expand Down
15 changes: 0 additions & 15 deletions jobs/uaa/templates/bin/configure_newrelic.erb

This file was deleted.

3 changes: 1 addition & 2 deletions jobs/uaa/templates/bin/uaa
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ function log {
}

source "/var/vcap/jobs/uaa/bin/configure_proxy"
source "/var/vcap/jobs/uaa/bin/configure_newrelic"

if [[ -f /var/vcap/data/uaa/cert-cache/cacerts ]]; then
KEYSTORE="/var/vcap/data/uaa/cert-cache/cacerts"
Expand All @@ -29,7 +28,7 @@ log "Keystore configured to: $KEYSTORE"
readonly uaa_log_dir="/var/vcap/sys/log/uaa/"
PATH="/var/vcap/packages/uaa/jdk/bin:$PATH"
JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -DPID=$$"
JAVA_OPTS="$JAVA_OPTS -Dnetworkaddress.cache.ttl=0 $HTTP_PROXY_JAVA_OPTIONS $NEWRELIC_OPTS $KEYSTORE_OPTS"
JAVA_OPTS="$JAVA_OPTS -Dnetworkaddress.cache.ttl=0 $HTTP_PROXY_JAVA_OPTIONS $KEYSTORE_OPTS"
JAVA_OPTS="$JAVA_OPTS -Dlog4j.configurationFile=/var/vcap/jobs/uaa/config/log4j2.properties"
JAVA_OPTS="$JAVA_OPTS -Dlog4j2.formatMsgNoLookups=true"
JAVA_OPTS="$JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"
Expand Down
11 changes: 0 additions & 11 deletions jobs/uaa/templates/config/newrelic.yml.erb

This file was deleted.

1 change: 0 additions & 1 deletion packages/uaa/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ rm -rf webapps/*
cp -a ${BOSH_COMPILE_TARGET}/uaa/cloudfoundry-identity-uaa.war webapps/ROOT.war
cp -a ${BOSH_COMPILE_TARGET}/uaa/cloudfoundry-identity-statsd.war webapps/statsd.war
cp -a ${BOSH_COMPILE_TARGET}/uaa/tomcat-listener.jar lib/tomcat-listener.jar
cp -a ${BOSH_COMPILE_TARGET}/uaa/newrelic.jar bin/newrelic.jar

chmod 0755 bin/
chmod 0755 bin/*.sh
4 changes: 0 additions & 4 deletions spec/input/all-properties-set.yml
Original file line number Diff line number Diff line change
Expand Up @@ -611,10 +611,6 @@ properties:
timestamp: rfc3339
login:
client_secret: loginsecret
newrelic:
testing_new_relic_values_1: value1
testing_new_relic_values_2:
sub_2: value2
password:
policy:
expirePasswordInMonths: 0
Expand Down

0 comments on commit a807c1c

Please sign in to comment.