From da2c4aac5ca33ab52fa36ec941b02ed425d78e56 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Wed, 9 Oct 2013 15:52:16 -0700 Subject: [PATCH 01/34] enable auto app naming --- resources/new-relic/newrelic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/new-relic/newrelic.yml b/resources/new-relic/newrelic.yml index 5e9507b4b9..3b677d5141 100644 --- a/resources/new-relic/newrelic.yml +++ b/resources/new-relic/newrelic.yml @@ -13,7 +13,7 @@ common: &default_settings # You must specify the license key associated with your New Relic # account. This key binds your Agent's data to your account in the # New Relic service. - license_key: '' + license_key: '366ad1c39721f328781ff89cfac714174fbddc88' # Agent Enabled # Use this setting to force the agent to run or not run. @@ -26,7 +26,7 @@ common: &default_settings # This provides a finer-grained performance breakdown for # web apps in New Relic. # Default is false. - enable_auto_app_naming: false + enable_auto_app_naming: true # Set to true to enable component-based transaction naming. # Set to false to use the URI of a web request as the name of the transaction. From 191bccff293c58732c446d34c6741795e055091c Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Wed, 9 Oct 2013 15:53:42 -0700 Subject: [PATCH 02/34] Update server.xml --- resources/tomcat/conf/server.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 30bcfe2ca1..67548b2732 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,8 +21,7 @@ - - + From 9ffb0ff7d409091e608098d44ecba8b1c94b5177 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Thu, 10 Oct 2013 09:50:15 -0700 Subject: [PATCH 03/34] use bagelswitch repo for tomcat tarball --- config/tomcat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index 3943df3370..a353dce7fc 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "http://download.pivotal.io.s3.amazonaws.com/tomcat" +repository_root: "http://github.com/bagelswitch/cf-tomcat/blob/master/tomcat-7.0.42.tar.gz" support: version: 1.1.+ repository_root: "http://download.pivotal.io.s3.amazonaws.com/tomcat-buildpack-support" From 5b4d979e943836da7b2361b71656e0481a727250 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Thu, 10 Oct 2013 09:52:10 -0700 Subject: [PATCH 04/34] use bagelswitch repo for tomcat tarball --- config/tomcat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index a353dce7fc..a0fe2c1fc0 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "http://github.com/bagelswitch/cf-tomcat/blob/master/tomcat-7.0.42.tar.gz" +repository_root: "http://github.com/bagelswitch/cf-tomcat/blob/master/tomcat-7.0.42.tar.gz?raw=true" support: version: 1.1.+ repository_root: "http://download.pivotal.io.s3.amazonaws.com/tomcat-buildpack-support" From aa38ece6cdacfa30d677f57b9d7c13df02eceaae Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Thu, 10 Oct 2013 10:16:20 -0700 Subject: [PATCH 05/34] Update tomcat.yml --- config/tomcat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index a0fe2c1fc0..241b798083 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "http://github.com/bagelswitch/cf-tomcat/blob/master/tomcat-7.0.42.tar.gz?raw=true" +repository_root: "http://github.com/bagelswitch/cf-tomcat/tomcat" support: version: 1.1.+ - repository_root: "http://download.pivotal.io.s3.amazonaws.com/tomcat-buildpack-support" + repository_root: "http://github.com/bagelswitch/cf-tomcat/tomcat-buildpack-support" From d90f03c1d93cbcbe8e79bfb6b7117f068e26c926 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Thu, 10 Oct 2013 10:29:48 -0700 Subject: [PATCH 06/34] Update tomcat.yml --- config/tomcat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index 241b798083..8e7e26d6e7 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "http://github.com/bagelswitch/cf-tomcat/tomcat" +repository_root: "http://github.com/bagelswitch/cf-tomcat/raw/master/tomcat" support: version: 1.1.+ - repository_root: "http://github.com/bagelswitch/cf-tomcat/tomcat-buildpack-support" + repository_root: "http://github.com/bagelswitch/cf-tomcat/raw/master/tomcat-buildpack-support" From 7983877d9db54d7e752c6119a3ab7f28ecdee4ac Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Thu, 10 Oct 2013 10:50:44 -0700 Subject: [PATCH 07/34] Update tomcat.yml --- config/tomcat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index 8e7e26d6e7..dcb63a611b 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "http://github.com/bagelswitch/cf-tomcat/raw/master/tomcat" +repository_root: "https://github.com/bagelswitch/cf-tomcat/raw/master/tomcat" support: version: 1.1.+ - repository_root: "http://github.com/bagelswitch/cf-tomcat/raw/master/tomcat-buildpack-support" + repository_root: "https://github.com/bagelswitch/cf-tomcat/raw/master/tomcat-buildpack-support" From 553c43bac881d49dda9a633f15c1897d3db5814c Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Thu, 10 Oct 2013 11:03:17 -0700 Subject: [PATCH 08/34] fix urls --- config/tomcat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index dcb63a611b..3cdadf8e9c 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "https://github.com/bagelswitch/cf-tomcat/raw/master/tomcat" +repository_root: "https://raw.github.com/bagelswitch/cf-tomcat/master/tomcat" support: version: 1.1.+ - repository_root: "https://github.com/bagelswitch/cf-tomcat/raw/master/tomcat-buildpack-support" + repository_root: "https://raw.github.com/bagelswitch/cf-tomcat/master/tomcat-buildpack-support" From 94f525feb2dd895e2244b87fc7b043c373bd0b71 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Thu, 10 Oct 2013 11:29:56 -0700 Subject: [PATCH 09/34] Update tomcat.yml --- config/tomcat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index 3cdadf8e9c..b594c1ceeb 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "https://raw.github.com/bagelswitch/cf-tomcat/master/tomcat" +repository_root: "http://yum-dfw-01.wbx2.com/cf-tomcat/tomcat" support: version: 1.1.+ - repository_root: "https://raw.github.com/bagelswitch/cf-tomcat/master/tomcat-buildpack-support" + repository_root: "http://yum-dfw-01.wbx2.com/cf-tomcat/tomcat-buildpack-support" From efd0efcfe00afc88b4c3203323f798765ffb51bc Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sat, 19 Oct 2013 13:06:55 -0700 Subject: [PATCH 10/34] add perf tunables --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 67548b2732..4696efd476 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,7 +21,7 @@ - + From fa11149e06a3894582f54ca49bacc91677193851 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sat, 19 Oct 2013 14:23:54 -0700 Subject: [PATCH 11/34] Update server.xml --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 4696efd476..80cc76248c 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,7 +21,7 @@ - + From d3c27282796c385361b9e472b14fc78447a6c84e Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sat, 19 Oct 2013 16:00:27 -0700 Subject: [PATCH 12/34] Update server.xml --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 80cc76248c..67548b2732 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,7 +21,7 @@ - + From 7381c253c4be50a955e11ed93d46f2e47f9bc3a5 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sun, 20 Oct 2013 07:49:43 -0700 Subject: [PATCH 13/34] Update server.xml --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 67548b2732..772018f192 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,7 +21,7 @@ - + From 958c7d128b9c639766d7a555cf60583adf37b119 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sun, 20 Oct 2013 09:00:18 -0700 Subject: [PATCH 14/34] Update server.xml --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 772018f192..9b3e95be12 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,7 +21,7 @@ - + From 6f3597d04cb7ac6afda9d12e63c1346e54bf2847 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sun, 20 Oct 2013 09:07:49 -0700 Subject: [PATCH 15/34] Update server.xml --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 9b3e95be12..a6a3a113d4 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,7 +21,7 @@ - + From 7fe4febc490335f4a259b9bf189c4d450eeae74d Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sun, 20 Oct 2013 09:33:44 -0700 Subject: [PATCH 16/34] Update server.xml --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index a6a3a113d4..4652cce3a5 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,7 +21,7 @@ - + From 3951dd86a5030acd88ffde7cc3f7f51bfa1b10c3 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sun, 20 Oct 2013 10:54:25 -0700 Subject: [PATCH 17/34] Update server.xml --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 4652cce3a5..a6a3a113d4 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,7 +21,7 @@ - + From dedb6d6a7c6a500db67b0e619df8576e9c57515c Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Tue, 22 Oct 2013 18:57:12 -0700 Subject: [PATCH 18/34] Update server.xml --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index a6a3a113d4..3c16ae5841 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -21,7 +21,7 @@ - + From 1b7cca6205d96aadc86ae30fde40f98da9ea8f62 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Wed, 23 Oct 2013 12:27:11 -0700 Subject: [PATCH 19/34] Update newrelic.yml --- resources/new-relic/newrelic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/new-relic/newrelic.yml b/resources/new-relic/newrelic.yml index 3b677d5141..3834d087e8 100644 --- a/resources/new-relic/newrelic.yml +++ b/resources/new-relic/newrelic.yml @@ -26,7 +26,7 @@ common: &default_settings # This provides a finer-grained performance breakdown for # web apps in New Relic. # Default is false. - enable_auto_app_naming: true + enable_auto_app_naming: false # Set to true to enable component-based transaction naming. # Set to false to use the URI of a web request as the name of the transaction. @@ -40,7 +40,7 @@ common: &default_settings # For example, to report data to"My Application" and "My Application 2" use this: # app_name: My Application;My Application 2 # This setting is required. - app_name: My Application + app_name: <%= ENV["NEW_RELIC_APP_NAME"] %> # The agent uses its own log file to keep its logging # separate from that of your application. Specify the log level here. From 72f9167d2825941b673df7f916365c43af824b68 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Wed, 23 Oct 2013 12:28:10 -0700 Subject: [PATCH 20/34] Update newrelic.yml --- resources/new-relic/newrelic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/new-relic/newrelic.yml b/resources/new-relic/newrelic.yml index 3834d087e8..f8ec331831 100644 --- a/resources/new-relic/newrelic.yml +++ b/resources/new-relic/newrelic.yml @@ -13,7 +13,7 @@ common: &default_settings # You must specify the license key associated with your New Relic # account. This key binds your Agent's data to your account in the # New Relic service. - license_key: '366ad1c39721f328781ff89cfac714174fbddc88' + license_key: 'fc755f3350ad2603846fe6517c01769d6a63888a' # Agent Enabled # Use this setting to force the agent to run or not run. From eadbe893b2e4e3890beec61ea45d739b06ec1ed3 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Thu, 31 Oct 2013 14:26:40 -0700 Subject: [PATCH 21/34] use internal URLs for tarball retrieval --- config/tomcat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index b594c1ceeb..948cf84c63 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "http://yum-dfw-01.wbx2.com/cf-tomcat/tomcat" +repository_root: "http://yum-dfw-01-admin.wbx2.com/cf-tomcat/tomcat" support: version: 1.1.+ - repository_root: "http://yum-dfw-01.wbx2.com/cf-tomcat/tomcat-buildpack-support" + repository_root: "http://yum-dfw-01-admin.wbx2.com/cf-tomcat/tomcat-buildpack-support" From 6f66b6506e50f6eee7c358b5ae2ea165db537d82 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sat, 2 Nov 2013 14:15:37 -0700 Subject: [PATCH 22/34] revert repo URLs to public interfaces --- config/tomcat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index 948cf84c63..b594c1ceeb 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "http://yum-dfw-01-admin.wbx2.com/cf-tomcat/tomcat" +repository_root: "http://yum-dfw-01.wbx2.com/cf-tomcat/tomcat" support: version: 1.1.+ - repository_root: "http://yum-dfw-01-admin.wbx2.com/cf-tomcat/tomcat-buildpack-support" + repository_root: "http://yum-dfw-01.wbx2.com/cf-tomcat/tomcat-buildpack-support" From c2e58d3864e7cfbb00939a2d952887f14b0ff7e9 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sat, 9 Nov 2013 07:20:38 -0800 Subject: [PATCH 23/34] add BASIC auth support --- resources/tomcat/conf/server.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 3c16ae5841..02d74ec424 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -19,11 +19,22 @@ + + + + + + + From c5a4ae1ad765ea077358bb338ca0dd10c7886dbc Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sun, 22 Dec 2013 08:26:11 -0800 Subject: [PATCH 24/34] allow unlimited keepalive requests --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 02d74ec424..30f3d0e329 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -29,7 +29,7 @@ - + From e6bfdeddcc4cbb5cdbecab3d4baf105b8e121ddd Mon Sep 17 00:00:00 2001 From: ncohensm Date: Tue, 14 Jan 2014 15:30:03 -0800 Subject: [PATCH 25/34] add app state context listener --- resources/tomcat/conf/server.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 30f3d0e329..8d3e716136 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -37,6 +37,7 @@ + From a0399e16800b32e9adbdfd59427b79ecd0e7840b Mon Sep 17 00:00:00 2001 From: ncohensm Date: Thu, 16 Jan 2014 13:13:31 -0800 Subject: [PATCH 26/34] remove unneeded reference to app state context listener from buildpack --- resources/tomcat/conf/server.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 8d3e716136..30f3d0e329 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -37,7 +37,6 @@ - From b6ee0997c43016ac76acaaf422ad44eb6fc0a59d Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sat, 25 Jan 2014 09:36:48 -0800 Subject: [PATCH 27/34] try specifying default heap size --- config/openjdk.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/openjdk.yml b/config/openjdk.yml index 56d9228b86..709c329c40 100644 --- a/config/openjdk.yml +++ b/config/openjdk.yml @@ -18,6 +18,7 @@ repository_root: "http://download.pivotal.io.s3.amazonaws.com/openjdk/{platform}/{architecture}" version: 1.7.0_+ memory_sizes: + heap: 1024m memory_heuristics: heap: 0.75 permgen: 0.1 From c29c0875e53307ff9889bf9fe153c19a9d760810 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Sat, 25 Jan 2014 10:00:14 -0800 Subject: [PATCH 28/34] set heap size to reflect current default behavior --- config/openjdk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/openjdk.yml b/config/openjdk.yml index 709c329c40..43b9905301 100644 --- a/config/openjdk.yml +++ b/config/openjdk.yml @@ -18,7 +18,7 @@ repository_root: "http://download.pivotal.io.s3.amazonaws.com/openjdk/{platform}/{architecture}" version: 1.7.0_+ memory_sizes: - heap: 1024m + heap: 2048m memory_heuristics: heap: 0.75 permgen: 0.1 From 2ef82c407d49f63fd904c5ea322dec7ec43fb343 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Mon, 3 Feb 2014 19:02:44 -0800 Subject: [PATCH 29/34] reduce max heap to 1024M --- config/openjdk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/openjdk.yml b/config/openjdk.yml index 43b9905301..709c329c40 100644 --- a/config/openjdk.yml +++ b/config/openjdk.yml @@ -18,7 +18,7 @@ repository_root: "http://download.pivotal.io.s3.amazonaws.com/openjdk/{platform}/{architecture}" version: 1.7.0_+ memory_sizes: - heap: 2048m + heap: 1024m memory_heuristics: heap: 0.75 permgen: 0.1 From 02576076fe93d9f8242b70158521893e992ef0fd Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Thu, 6 Feb 2014 08:58:07 -0800 Subject: [PATCH 30/34] Update newrelic.yml --- resources/new-relic/newrelic.yml | 156 ++++++++++++++++++------------- 1 file changed, 92 insertions(+), 64 deletions(-) diff --git a/resources/new-relic/newrelic.yml b/resources/new-relic/newrelic.yml index f8ec331831..cff6c64e42 100644 --- a/resources/new-relic/newrelic.yml +++ b/resources/new-relic/newrelic.yml @@ -1,24 +1,33 @@ +# This file configures the New Relic Agent. New Relic monitors +# Java applications with deep visibility and low overhead. For more details and additional +# configuration options visit https://docs.newrelic.com/docs/java/java-agent-configuration. # -# This file configures the New Relic Agent. New Relic monitors -# Java applications with deep visibility and low overhead. For more -# information, visit www.newrelic.com. -# +# This configuration file is custom generated for Cisco WebEx Files # # This section is for settings common to all environments. # Do not add anything above this next line. common: &default_settings - # - # ============================== LICENSE KEY =============================== + # ============================== LICENSE KEY =============================== # You must specify the license key associated with your New Relic - # account. This key binds your Agent's data to your account in the + # account. This key binds your Agent's data to your account in the # New Relic service. license_key: 'fc755f3350ad2603846fe6517c01769d6a63888a' # Agent Enabled - # Use this setting to force the agent to run or not run. + # Use this setting to disable the agent instead of removing it from the startup command. # Default is true. - # agent_enabled: true + agent_enabled: true + + # Set the name of your application as you'd like it show up in New Relic. + # If enable_auto_app_naming is false, the agent reports all data to this application. + # Otherwise, the agent reports only background tasks (transactions for non-web applications) + # to this application. To report data to more than one application + # (useful for rollup reporting), separate the application names with ";". + # For example, to report data to "My Application" and "My Application 2" use this: + # app_name: My Application;My Application 2 + # This setting is required. + app_name: <%= ENV["NEW_RELIC_APP_NAME"] %> # Set to true to enable support for auto app naming. # The name of each web app is detected automatically @@ -33,50 +42,42 @@ common: &default_settings # Default is true. enable_auto_transaction_naming: true - # Set the name of your application as you'd like it show up in New Relic. - # if enable_auto_app_naming is false, the agent reports all data to this application. - # Otherwise, the agent reports only background tasks (transactions for non-web applications) to this application. - # To report data to more than one application, separate the application names with ";". - # For example, to report data to"My Application" and "My Application 2" use this: - # app_name: My Application;My Application 2 - # This setting is required. - app_name: <%= ENV["NEW_RELIC_APP_NAME"] %> - # The agent uses its own log file to keep its logging - # separate from that of your application. Specify the log level here. + # separate from that of your application. Specify the log level here. # This setting is dynamic, so changes do not require restarting your application. - # The levels in increasing order of verboseness are: off, severe, warning, info, fine, finer, finest + # The levels in increasing order of verboseness are: + # off, severe, warning, info, fine, finer, finest # Default is info. log_level: info - # Log all data to and from New Relic in plain text. + # Log all data sent to and from New Relic in plain text. # This setting is dynamic, so changes do not require restarting your application. # Default is false. - #audit_mode: true + audit_mode: false - # The number of log files to use. + # The number of backup log files to save. # Default is 1. - #log_file_count: 1 + log_file_count: 10 # The maximum number of bytes to write to any one log file. # The log_file_count must be set greater than 1. # Default is 0 (no limit). - #log_limit_in_kbytes: 0 + log_limit_in_kbytes: 10000 # Override other log rolling configuration and roll the logs daily. # Default is false. - #log_daily: false + log_daily: false # The name of the log file. # Default is newrelic_agent.log. - #log_file_name: newrelic_agent.log + log_file_name: newrelic_agent.log # The log file directory. # Default is the logs directory in the newrelic.jar parent directory. #log_file_path: # The agent communicates with New Relic via https by - # default. If you want to communicate with newrelic via http, + # default. If you want to communicate with newrelic via http, # then turn off SSL by setting this value to false. # This work is done asynchronously to the threads that process your # application code, so response times will not be directly affected @@ -84,27 +85,40 @@ common: &default_settings # Default is true. ssl: true - # Proxy settings for connecting to the New Relic server. - # - # If a proxy is used, the host setting is required. Other settings - # are optional. Default port is 8080. The username and password + # Proxy settings for connecting to the New Relic server: + # If a proxy is used, the host setting is required. Other settings + # are optional. Default port is 8080. The username and password # settings will be used to authenticate to Basic Auth challenges # from a proxy server. - # - # proxy_host: hostname - # proxy_port: 8080 - # proxy_user: username - # proxy_password: password + #proxy_host: hostname + #proxy_port: 8080 + #proxy_user: username + #proxy_password: password + + # Limits the number of lines to capture for each stack trace. + # Default is 30 + max_stack_trace_lines: 30 # Tells transaction tracer and error collector (when enabled) - # whether or not to capture HTTP params. When true, frameworks can + # whether or not to capture HTTP params. When true, frameworks can # exclude HTTP parameters from being captured. # Default is false. capture_params: false # Tells transaction tracer and error collector to not to collect # specific http request parameters. - # ignored_params: credit_card, ssn, password + #ignored_params: credit_card, ssn, password + + # Similar to capture_params but for message handling. + # When processing a message through a MessageListener, if enabled, + # custom parameters set on the message will be captured subject to + # the filters on ignored_messaging_params. + # Default is false. + capture_messaging_params: false + + # Tells transaction tracer and error collector to not to collect + # specific message properties. + #ignored_messaging_params: userid, authtoken # Transaction tracer captures deep information about slow # transactions and sends this to the New Relic service once a @@ -112,8 +126,8 @@ common: &default_settings # the transactions including any SQL statements issued. transaction_tracer: - # Transaction tracer is enabled by default. Set this to false to - # turn it off. This feature is only available at the higher product levels. + # Transaction tracer is enabled by default. Set this to false to turn it off. + # This feature is not available to Lite accounts and is automatically disabled. # Default is true. enabled: true @@ -155,7 +169,7 @@ common: &default_settings explain_enabled: true # Threshold for query execution time below which query plans will not - # not be captured. Relevant only when `explain_enabled` is true. + # not be captured. Relevant only when `explain_enabled` is true. # Default is 0.5 seconds. explain_threshold: 0.5 @@ -165,64 +179,78 @@ common: &default_settings # Default is 20. top_n: 20 - # Error collector captures information about uncaught exceptions and - # sends them to New Relic for viewing + # sends them to New Relic for viewing. error_collector: - # Error collector is enabled by default. Set this to false to turn - # it off. This feature is only available at the higher product levels. + # This property enables the collection of errors. If the property is not + # set or the property is set to false, then errors will not be collected. # Default is true. enabled: true - # To stop specific exceptions from reporting to New Relic, set this property - # to a comma separated list of full class names. - # - # ignore_errors: + # Use this property to exclude specific exceptions from being reported as errors + # by providing a comma separated list of full class names. + # The default is to exclude akka.actor.ActorKilledException. If you want to override + # this, you must provide any new value as an empty list is ignored. + ignore_errors: akka.actor.ActorKilledException + + # Use this property to exclude specific http status codes from being reported as errors + # by providing a comma separated list of status codes. + # The default is to exclude 404s. If you want to override + # this, you must provide any new value as an empty list is ignored. + ignore_status_codes: 404 + + # Analytics Events are used for Histograms and Percentiles. Unaggregated data is collected + # for each web transaction and sent to the server on harvest. + analytics_events: + + # Set to false to disable analytics events. + # Default is true. + enabled: true - # To stop specific http status codes from being reporting to New Relic as errors, - # set this property to a comma separated list of status codes to ignore. - # When this property is commented out it defaults to ignoring 404s. - # - # ignore_status_codes: 404 + # Events are collected up to the configured amount. Afterwards, events are sampled to + # maintain an even distribution across the harvest cycle. Largest value accepted is 10000. + # Default is 2000. Setting to 0 will disable. + max_samples_stored: 2000 # Cross Application Tracing adds request and response headers to - # external calls using the Apache HttpClient libraries to provided better + # external calls using supported HTTP libraries to provide better # performance data when calling applications monitored by other New Relic Agents. - # cross_application_tracer: - # Set to true to enable cross application tracing. + + # Set to false to disable cross application tracing. # Default is true. enabled: true # Thread profiler measures wall clock time, CPU time, and method call counts # in your application's threads as they run. + # This feature is not available to Lite accounts and is automatically disabled. thread_profiler: # Set to false to disable the thread profiler. # Default is true. enabled: true - #============================== Browser Monitoring =============================== # New Relic Real User Monitoring gives you insight into the performance real users are # experiencing with your website. This is accomplished by measuring the time it takes for # your users' browsers to download and render your web pages by injecting a small amount # of JavaScript code into the header and footer of each page. browser_monitoring: + # By default the agent automatically inserts API calls in compiled JSPs to - # inject the monitoring JavaScript into web pages. + # inject the monitoring JavaScript into web pages. Not all rendering engines are supported. + # See https://docs.newrelic.com/docs/java/real-user-monitoring-in-java#manual_instrumentation + # for instructions to add these manually to your pages. # Set this attribute to false to turn off this behavior. auto_instrument: true - # Set this attribute to false to prevent injection of the monitoring JavaScript. - # Default is true. - enabled: true + # Application Environments # ------------------------------------------ # Environment specific settings are in this section. # You can use the environment to override the default settings. # For example, to change the app_name setting. -# Use -Dnewrelic.environment= on the Java command line +# Use -Dnewrelic.environment= on the Java startup command line # to set the environment. # The default environment is production. From 0151acdb7473bb65172a7638abd9d1c92701a288 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Wed, 19 Feb 2014 08:29:46 -0800 Subject: [PATCH 31/34] increase max heap to 1536MB --- config/openjdk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/openjdk.yml b/config/openjdk.yml index 709c329c40..e4826c493c 100644 --- a/config/openjdk.yml +++ b/config/openjdk.yml @@ -18,7 +18,7 @@ repository_root: "http://download.pivotal.io.s3.amazonaws.com/openjdk/{platform}/{architecture}" version: 1.7.0_+ memory_sizes: - heap: 1024m + heap: 1536m memory_heuristics: heap: 0.75 permgen: 0.1 From 425dcaf799e820e5b1e6ff6bbf29d37ccb3bc198 Mon Sep 17 00:00:00 2001 From: bagelswitch Date: Wed, 19 Feb 2014 14:50:09 -0800 Subject: [PATCH 32/34] revert max heap to 1GB --- config/openjdk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/openjdk.yml b/config/openjdk.yml index e4826c493c..709c329c40 100644 --- a/config/openjdk.yml +++ b/config/openjdk.yml @@ -18,7 +18,7 @@ repository_root: "http://download.pivotal.io.s3.amazonaws.com/openjdk/{platform}/{architecture}" version: 1.7.0_+ memory_sizes: - heap: 1536m + heap: 1024m memory_heuristics: heap: 0.75 permgen: 0.1 From 85c2b1f33868409f9b5087c8f2675cc92f9795f2 Mon Sep 17 00:00:00 2001 From: ncohensm Date: Thu, 10 Apr 2014 14:11:01 -0700 Subject: [PATCH 33/34] increase idle connection timeout to 60s --- resources/tomcat/conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 30f3d0e329..50d680c74f 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -29,7 +29,7 @@ - + From 7e6569a4e81976159f2c47b219d88641c2d15af0 Mon Sep 17 00:00:00 2001 From: K Clair Date: Tue, 6 May 2014 21:49:16 +0000 Subject: [PATCH 34/34] update location of cf-tomcat --- config/tomcat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tomcat.yml b/config/tomcat.yml index b594c1ceeb..85cc7ef037 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,7 +16,7 @@ # Configuration for the Tomcat container --- version: 7.0.+ -repository_root: "http://yum-dfw-01.wbx2.com/cf-tomcat/tomcat" +repository_root: "http://cf-buildpack.wbx2.com/cf-tomcat/tomcat" support: version: 1.1.+ - repository_root: "http://yum-dfw-01.wbx2.com/cf-tomcat/tomcat-buildpack-support" + repository_root: "http://cf-buildpack.wbx2.com/cf-tomcat/tomcat-buildpack-support"