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 diff --git a/config/tomcat.yml b/config/tomcat.yml index 3943df3370..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://download.pivotal.io.s3.amazonaws.com/tomcat" +repository_root: "http://cf-buildpack.wbx2.com/cf-tomcat/tomcat" support: version: 1.1.+ - repository_root: "http://download.pivotal.io.s3.amazonaws.com/tomcat-buildpack-support" + repository_root: "http://cf-buildpack.wbx2.com/cf-tomcat/tomcat-buildpack-support" diff --git a/resources/new-relic/newrelic.yml b/resources/new-relic/newrelic.yml index 5e9507b4b9..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: '' + 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: My Application - # 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 - # 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 + # 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 + + # 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. diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml index 30bcfe2ca1..50d680c74f 100644 --- a/resources/tomcat/conf/server.xml +++ b/resources/tomcat/conf/server.xml @@ -19,12 +19,22 @@ + + + + - - + + + +