diff --git a/config/blobs.yml b/config/blobs.yml index 2c9c7fd6ca..470161de94 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -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 diff --git a/jobs/uaa/spec b/jobs/uaa/spec index 380eda92a7..1ac46f3487 100644 --- a/jobs/uaa/spec +++ b/jobs/uaa/spec @@ -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 @@ -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 @@ -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" diff --git a/jobs/uaa/templates/bin/configure_newrelic.erb b/jobs/uaa/templates/bin/configure_newrelic.erb deleted file mode 100644 index 22b7416768..0000000000 --- a/jobs/uaa/templates/bin/configure_newrelic.erb +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -e - -NEWRELIC_OPTS= -<% if_p('uaa.newrelic') do |newrelic| - newrelicenv = newrelic['environment'] || 'production' - - hasnewreliclic = p('uaa.newrelic.common.license_key', nil) || p('uaa.newrelic.'+newrelicenv+'.license_key', '').to_s.strip.length > 0 - - if hasnewreliclic %> - <%= "NEWRELIC_OPTS=\"-javaagent:/var/vcap/data/uaa/tomcat/bin/newrelic.jar -Dnewrelic.config.file=/var/vcap/jobs/uaa/config/newrelic.yml -Dnewrelic.environment="+newrelicenv+"\"" %><% - end -end %> - -export NEWRELIC_OPTS -log "UAA New Relic set to:$NEWRELIC_OPTS" diff --git a/jobs/uaa/templates/bin/uaa b/jobs/uaa/templates/bin/uaa index ed801d1a2e..3e0d1b10b1 100644 --- a/jobs/uaa/templates/bin/uaa +++ b/jobs/uaa/templates/bin/uaa @@ -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" @@ -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" diff --git a/jobs/uaa/templates/config/newrelic.yml.erb b/jobs/uaa/templates/config/newrelic.yml.erb deleted file mode 100644 index 339929d05b..0000000000 --- a/jobs/uaa/templates/config/newrelic.yml.erb +++ /dev/null @@ -1,11 +0,0 @@ -<% -if_p('uaa.newrelic') do |newrelic| - newrelicenv = newrelic['environment'] || 'production' - - hasnewreliclic = p('uaa.newrelic.common.license_key', nil) || p('uaa.newrelic.'+newrelicenv+'.license_key', '').to_s.strip.length > 0 - - if hasnewreliclic %> -<%= require 'yaml'; YAML.dump(newrelic.reject {|x,_| x == 'environment'}) %><% - end -end -%> diff --git a/packages/uaa/packaging b/packages/uaa/packaging index 4fed475e4b..e1239507b9 100644 --- a/packages/uaa/packaging +++ b/packages/uaa/packaging @@ -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 diff --git a/spec/input/all-properties-set.yml b/spec/input/all-properties-set.yml index 1a81a198bf..4b9fb522d5 100644 --- a/spec/input/all-properties-set.yml +++ b/spec/input/all-properties-set.yml @@ -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