Commit dfd50056 authored by Felipe Salum's avatar Felipe Salum
Browse files

Merge pull request #14 from fsalum/refactor

Refactor module to major upgrade 4.x
parents 37e89cda 4588bb83
......@@ -4,6 +4,14 @@ Release notes for the fsalum-newrelic module.
------------------------------------------
#### 4.0.0 - 2014-06-29
* Refactored the module, test before pushing to production
* Added/Removed/Renamed/Changed parameters
* Updated template for new settings for newrelic.ini, newrelic.cfg and nrsysmond.cfg
* Closed PR #7 - Ensure log directory is created
* Closed PR #13 - Fix PHP conf dir for Ubuntu 14.04
#### 3.0.5 - 2014-06-05
* Add 'newrelic_daemon_cfgfile_ensure' parameter (@nbeernink)
......
name 'fsalum-newrelic'
version '3.0.5'
version '4.0.0'
source 'git://github.com/fsalum/puppet-newrelic.git'
author 'Felipe Salum'
license 'Apache License, Version 2.0'
......@@ -8,4 +8,5 @@ description 'Module to install and configure New Relic server monitoring and New
project_page 'https://github.com/fsalum/puppet-newrelic'
## Add dependencies, if any:
dependency 'puppetlabs/apt', '>= 0.0.4'
dependency 'puppetlabs/apt', '>= 1.5.0'
dependency 'puppetlabs/stdlib', '>= 4.1.0'
......@@ -9,16 +9,14 @@ Supported systems: Debian and RHEL osfamily Linux.
Operating System
----------------
Tested on CentOS 6.3 and Debian Squeeze.
Tested on CentOS, Debian and Ubuntu.
IMPORTANT
---------
If you were using the previous version of this module `0.0.1` you need to change
how you declare the class because I'm now using defined resource types and I have
split the Server Monitoring and PHP Agent classes to be easy to maintain.
Module version 4.x was refactored. A lot of parameters were added, removed, renamed or changed.
All the parameters are still the same and new parameters were included.
Review all the parameters you use before deploying this module in production.
Quick Start
-----------
......@@ -33,15 +31,28 @@ To install the Newrelic Server Monitoring and the PHP agent packages, include th
newrelic::php {
'appXYZ':
newrelic_license_key => 'your license key here',
newrelic_php_conf_appname => 'Your PHP Application',
newrelic_license_key => 'your license key here',
newrelic_ini_appname => 'Your PHP Application',
}
}
If you use Ubuntu 14.04 and php5-fpm you can pass an array of directories for PHP ini files:
newrelic::php {
'appXYZ':
newrelic_license_key => 'your license key here',
newrelic_ini_appname => 'Your PHP Application',
newrelic_php_conf_dir => [‘/etc/php5/apache2/conf.d’,’/etc/php5/fpm/conf.d’],
}
}
Parameters
----------
There are a lot of parameters you can customize, check the `.pp` files and the New Relic documentation to understand them.
There are a lot of parameters you can customize, check the `.pp` files and the [New Relic documentation](https://docs.newrelic.com/docs/php/php-agent-phpini-settings) to understand them.
Mandatory parameters:
* newrelic_license_key
Copyright and License
---------------------
......
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
if ENV['VAGRANT_HOME'].nil?
ENV['VAGRANT_HOME'] = './'
end
newrelic = {
:'centos65' => { :memory => '120', :ip => '10.1.2.13', :box => 'puppetlabs/centos-6.5-64-puppet', :domain => 'newrelic.local' },
:'trusty' => { :memory => '360', :ip => '10.1.2.14', :box => 'ubuntu/trusty64', :domain => 'newrelic.local' },
:'saucy' => { :memory => '120', :ip => '10.1.2.15', :box => 'puppetlabs/ubuntu-13.10-64-puppet', :domain => 'newrelic.local' },
:'precise' => { :memory => '120', :ip => '10.1.2.16', :box => 'puppetlabs/ubuntu-12.04-64-puppet', :domain => 'newrelic.local' },
:'debian74' => { :memory => '120', :ip => '10.1.2.17', :box => 'puppetlabs/debian-7.4-64-puppet', :domain => 'newrelic.local' },
}
Vagrant::Config.run("2") do |config|
config.vbguest.auto_update = false
config.hostmanager.enabled = false
newrelic.each_pair do |name, opts|
config.vm.define name do |n|
config.vm.provider :virtualbox do |vb|
vb.customize ["modifyvm", :id, "--memory", opts[:memory] ]
end
n.vm.network "private_network", ip: opts[:ip]
n.vm.box = opts[:box]
n.vm.host_name = "#{name}" + "." + opts[:domain]
n.vm.synced_folder "#{ENV['VAGRANT_HOME']}","/etc/puppet/modules/newrelic"
n.vm.provision :shell, :inline => "gem install puppet facter --no-ri --no-rdoc" if name == "trusty"
n.vm.provision :shell, :inline => "puppet module install puppetlabs-apt"
n.vm.provision :shell, :inline => "puppet module install puppetlabs-apache"
n.vm.provision :puppet do |puppet|
puppet.manifests_path = "tests"
puppet.manifest_file = "php.pp"
puppet.module_path = "./"
end
end
end
end
......@@ -12,25 +12,25 @@
#
class newrelic::params {
case $::operatingsystem {
'centos', 'redhat', 'fedora', 'amazon': {
case $::osfamily {
'RedHat': {
$newrelic_package_name = 'newrelic-sysmond'
$newrelic_service_name = 'newrelic-sysmond'
$newrelic_php_package = 'newrelic-php5'
$newrelic_php_service = 'newrelic-daemon'
$newrelic_php_conf_dir = '/etc/php.d'
$newrelic_php_conf_dir = ['/etc/php.d']
package { 'newrelic-repo-5-3.noarch':
ensure => present,
source => 'http://yum.newrelic.com/pub/newrelic/el5/x86_64/newrelic-repo-5-3.noarch.rpm',
provider => rpm,
}
}
'ubuntu', 'debian': {
'Debian': {
$newrelic_package_name = 'newrelic-sysmond'
$newrelic_service_name = 'newrelic-sysmond'
$newrelic_php_package = 'newrelic-php5'
$newrelic_php_service = 'newrelic-daemon'
$newrelic_php_conf_dir = '/etc/php5/conf.d'
$newrelic_php_conf_dir = ['/etc/php5/conf.d']
apt::source { 'newrelic':
location => 'http://apt.newrelic.com/debian/',
repos => 'newrelic non-free',
......
......@@ -10,35 +10,9 @@
# [*newrelic_php_service_ensure*]
# Specify the Newrelic PHP service running state. Defaults to 'running'. Possible value is 'stopped'.
#
# [*newrelic_php_conf_appname*]
# Sets the name of the application as it will be seen in the New Relic UI
#
# [*newrelic_php_conf_enabled*]
# By default the New Relic PHP agent is enabled for all directories. To disable set it to '0'.
#
# [*newrelic_php_conf_transaction*]
# This traces all calls, not just those calls internally instrumented by New Relic. To disable set it to '0'.
#
# [*newrelic_php_conf_logfile*]
# This identifies the file name for logging messages.
#
# [*newrelic_php_conf_loglevel*]
# Sets the level of detail of messages sent to the log file. Possible values: error, warning, info, verbose, debug, verbosedebug.
#
# [*newrelic_php_conf_browser*]
# This enables auto-insertion of the JavaScript fragments for browser monitoring. To disable set it to '0'.
#
# [*newrelic_php_conf_dberrors*]
# It causes MySQL errors from all instrumented MySQL calls to be reported to New Relic. To enable set it to '1'.
#
# [*newrelic_php_conf_transactionrecordsql*]
# When recording transaction traces internally, the full SQL for slow SQL calls is recorded. Possible values: off, raw, obfuscated.
#
# [*newrelic_php_conf_captureparams*]
# This will enable the display of parameters passed to a PHP script via the URL. To enable set it to '1'.
#
# [*newrelic_daemon_cfgfile_ensure*]
# Specify if the Newrelic daemon cfg file state. Defaults to 'present'. Possible value is 'absent'.
# Specify the Newrelic daemon cfg file state. Change to absent for agent startup mode. Defaults to 'present'. Possible value is 'absent'.
#
# Actions:
#
# Requires:
......@@ -50,41 +24,73 @@
# newrelic_license_key => 'your license key here',
# newrelic_php_package_ensure => 'latest',
# newrelic_php_service_ensure => 'running',
# newrelic_php_conf_appname => 'Your PHP Application',
# newrelic_ini_appname => 'Your PHP Application',
# }
#
# If no parameters are set it will use the newrelic.ini defaults
#
# For detailed explanation about the parameters below see: https://docs.newrelic.com/docs/php/php-agent-phpini-settings
#
define newrelic::php (
$newrelic_license_key = '',
$newrelic_php_package_ensure = 'present',
$newrelic_php_service_ensure = 'running',
$newrelic_php_conf_appname = 'Your PHP Application',
$newrelic_php_conf_enabled = '1',
$newrelic_php_conf_transaction = '1',
$newrelic_php_conf_logfile = '/var/log/newrelic/php_agent.log',
$newrelic_php_conf_loglevel = 'info',
$newrelic_php_conf_browser = '1',
$newrelic_php_conf_dberrors = '0',
$newrelic_php_conf_transactionrecordsql = 'off',
$newrelic_php_conf_captureparams = '0',
$newrelic_php_conf_ignoredparams = '',
$newrelic_daemon_cfgfile_ensure = 'present',
$newrelic_daemon_pidfile = '/var/run/newrelic-daemon.pid',
$newrelic_daemon_logfile = '/var/log/newrelic/newrelic-daemon.log',
$newrelic_daemon_loglevel = 'info',
$newrelic_daemon_port = '33142',
$newrelic_daemon_ssl = false,
$newrelic_daemon_proxy = '',
$newrelic_daemon_ssl_ca_bundle = '',
$newrelic_daemon_ssl_ca_path = '',
$newrelic_daemon_max_threads = '8',
$newrelic_daemon_collector_host = 'collector.newrelic.com',
$newrelic_php_package_ensure = 'present',
$newrelic_php_service_ensure = 'running',
$newrelic_php_conf_dir = $newrelic::params::newrelic_php_conf_dir,
$newrelic_license_key = undef,
$newrelic_ini_appname = undef,
$newrelic_ini_browser_monitoring_auto_instrument = undef,
$newrelic_ini_enabled = undef,
$newrelic_ini_error_collector_enabled = undef,
$newrelic_ini_error_collector_prioritize_api_errors = undef,
$newrelic_ini_error_collector_record_database_errors = undef,
$newrelic_ini_framework = undef,
$newrelic_ini_high_security = undef,
$newrelic_ini_logfile = undef,
$newrelic_ini_loglevel = undef,
$newrelic_ini_transaction_tracer_custom = undef,
$newrelic_ini_transaction_tracer_detail = undef,
$newrelic_ini_transaction_tracer_enabled = undef,
$newrelic_ini_transaction_tracer_explain_enabled = undef,
$newrelic_ini_transaction_tracer_explain_threshold = undef,
$newrelic_ini_transaction_tracer_record_sql = undef,
$newrelic_ini_transaction_tracer_slow_sql = undef,
$newrelic_ini_transaction_tracer_stack_trace_threshold = undef,
$newrelic_ini_transaction_tracer_threshold = undef,
$newrelic_ini_capture_params = undef,
$newrelic_ini_ignored_params = undef,
$newrelic_daemon_cfgfile_ensure = 'present',
$newrelic_daemon_dont_launch = undef,
$newrelic_daemon_pidfile = undef,
$newrelic_daemon_location = undef,
$newrelic_daemon_logfile = undef,
$newrelic_daemon_loglevel = undef,
$newrelic_daemon_port = undef,
$newrelic_daemon_ssl = undef,
$newrelic_daemon_ssl_ca_bundle = undef,
$newrelic_daemon_ssl_ca_path = undef,
$newrelic_daemon_proxy = undef,
$newrelic_daemon_collector_host = undef,
$newrelic_daemon_auditlog = undef,
### Deprecated below
$newrelic_php_conf_appname = undef,
$newrelic_php_conf_enabled = undef,
$newrelic_php_conf_transaction = undef,
$newrelic_php_conf_logfile = undef,
$newrelic_php_conf_loglevel = undef,
$newrelic_php_conf_browser = undef,
$newrelic_php_conf_dberrors = undef,
$newrelic_php_conf_transactionrecordsql = undef,
$newrelic_php_conf_captureparams = undef,
$newrelic_php_conf_ignoredparams = undef,
) {
include newrelic
$newrelic_php_package = $newrelic::params::newrelic_php_package
$newrelic_php_service = $newrelic::params::newrelic_php_service
$newrelic_php_conf_dir = $newrelic::params::newrelic_php_conf_dir
if ! $newrelic_license_key {
fail('You must specify a valid License Key.')
}
package { $newrelic_php_package:
ensure => $newrelic_php_package_ensure,
......@@ -96,32 +102,53 @@ define newrelic::php (
enable => true,
hasrestart => true,
hasstatus => true,
require => Exec['/usr/bin/newrelic-install'],
}
exec { '/usr/bin/newrelic-install':
path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
command => "/usr/bin/newrelic-install purge ; NR_INSTALL_SILENT=yes, NR_INSTALL_KEY=${newrelic_license_key} /usr/bin/newrelic-install install",
provider => 'shell',
user => 'root',
group => 'root',
unless => "cat ${newrelic_php_conf_dir}/newrelic.ini | grep ${newrelic_license_key}",
require => Package[$newrelic_php_package],
}
file { 'newrelic.ini':
path => "${newrelic_php_conf_dir}/newrelic.ini",
content => template('newrelic/newrelic.ini.erb'),
require => Exec['/usr/bin/newrelic-install'],
::newrelic::php::newrelic_ini { $newrelic_php_conf_dir:
newrelic_license_key => $newrelic_license_key,
before => [ File['/etc/newrelic/newrelic.cfg'], Service[$newrelic_php_service] ],
require => Package[$newrelic_php_package],
notify => Service[$newrelic_php_service],
}
file { '/etc/newrelic/newrelic.cfg':
ensure => $newrelic_daemon_cfgfile_ensure,
path => '/etc/newrelic/newrelic.cfg',
content => template('newrelic/newrelic.cfg.erb'),
require => Exec['/usr/bin/newrelic-install'],
before => Service[$newrelic_php_service],
notify => Service[$newrelic_php_service],
}
# Fail on renamed/deprecated variables if they are still used
if $newrelic_php_conf_appname {
fail('Variable $newrelic_php_conf_appname is deprecated, use $newrelic_ini_appname instead.')
}
if $newrelic_php_conf_browser {
fail('Variable $newrelic_php_conf_browser is deprecated, use $newrelic_ini_browser_monitoring_auto_instrument instead.')
}
if $newrelic_php_conf_captureparams {
fail('Variable $newrelic_php_conf_captureparams is deprecated, use $newrelic_ini_capture_params instead.')
}
if $newrelic_php_conf_dberrors {
fail('Variable $newrelic_php_conf_dberrors is deprecated, use $newrelic_ini_error_collector_record_database_errors instead.')
}
if $newrelic_php_conf_enabled {
fail('Variable $newrelic_php_conf_enabled is deprecated, use $newrelic_ini_enabled instead.')
}
if $newrelic_php_conf_ignoredparams {
fail('Variable $newrelic_php_conf_ignoredparams is deprecated, use $newrelic_ini_ignored_params instead.')
}
if $newrelic_php_conf_logfile {
fail('Variable $newrelic_php_conf_logfile is deprecated, use $newrelic_ini_logfile instead.')
}
if $newrelic_php_conf_loglevel {
fail('Variable $newrelic_php_conf_loglevel is deprecated, use $newrelic_ini_loglevel instead.')
}
if $newrelic_php_conf_transactionrecordsql {
fail('Variable $newrelic_php_conf_transactionrecordsql is deprecated, use $newrelic_ini_transaction_tracer_record_sql instead.')
}
if $newrelic_php_conf_transaction {
fail('Variable $newrelic_php_conf_transaction is deprecated, use $newrelic_ini_transaction_tracer_detail instead.')
}
}
# This module should not be used directly. It is used by newrelic::php.
define newrelic::php::newrelic_ini (
$newrelic_license_key
) {
exec { "/usr/bin/newrelic-install ${name}":
path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
command => "/usr/bin/newrelic-install purge ; NR_INSTALL_SILENT=yes, NR_INSTALL_KEY=${newrelic_license_key} /usr/bin/newrelic-install install",
provider => 'shell',
user => 'root',
group => 'root',
unless => "grep ${newrelic_license_key} ${name}/newrelic.ini",
}
file { "${name}/newrelic.ini":
path => "${name}/newrelic.ini",
content => template('newrelic/newrelic.ini.erb'),
require => Exec["/usr/bin/newrelic-install ${name}"],
}
}
......@@ -36,10 +36,19 @@
# Copyright 2012 Felipe Salum, unless otherwise noted.
#
define newrelic::server (
$newrelic_license_key = '',
$newrelic_package_ensure = 'present',
$newrelic_service_enable = true,
$newrelic_service_ensure = 'running',
$newrelic_package_ensure = 'present',
$newrelic_service_enable = true,
$newrelic_service_ensure = 'running',
$newrelic_license_key = undef,
$newrelic_nrsysmond_loglevel = undef,
$newrelic_nrsysmond_logfile = undef,
$newrelic_nrsysmond_proxy = undef,
$newrelic_nrsysmond_ssl = undef,
$newrelic_nrsysmond_ssl_ca_bundle = undef,
$newrelic_nrsysmond_ssl_ca_path = undef,
$newrelic_nrsysmond_pidfile = undef,
$newrelic_nrsysmond_collector_host = undef,
$newrelic_nrsysmond_timeout = undef,
) {
include newrelic
......@@ -47,12 +56,39 @@ define newrelic::server (
$newrelic_package_name = $newrelic::params::newrelic_package_name
$newrelic_service_name = $newrelic::params::newrelic_service_name
if ! $newrelic_license_key {
fail('You must specify a valid License Key.')
}
package { $newrelic_package_name:
ensure => $newrelic_package_ensure,
notify => Service[$newrelic_service_name],
require => Class['newrelic::params'],
}
if ! $newrelic_nrsysmond_logfile {
$logdir = '/var/log/newrelic'
} else {
$logdir = dirname($newrelic_nrsysmond_logfile)
}
file { $logdir:
ensure => directory,
owner => 'newrelic',
group => 'newrelic',
require => Package[$newrelic_package_name],
before => Service[$newrelic_service_name],
}
file { '/etc/newrelic/nrsysmond.cfg':
ensure => present,
path => '/etc/newrelic/nrsysmond.cfg',
content => template('newrelic/nrsysmond.cfg.erb'),
require => Package[$newrelic_package_name],
before => Service[$newrelic_service_name],
notify => Service[$newrelic_service_name],
}
service { $newrelic_service_name:
ensure => $newrelic_service_ensure,
enable => $newrelic_service_enable,
......
......@@ -51,7 +51,10 @@
# which process to monitor or kill.
# Default: OS-dependent. Uses a filename of newrelic-daemon.pid in the first
# directory from the list /var/run or /var/pid that is found.
#pidfile=/var/run/newrelic-daemon.pid
<%- if @newrelic_daemon_pidfile -%>
pidfile=<%= @newrelic_daemon_pidfile %>
<%- end -%>
#
# Setting: logfile
......@@ -61,7 +64,10 @@ pidfile=<%= @newrelic_daemon_pidfile %>
# will not start up. The amount of information sent to this file is
# controlled by the loglevel settings, defined below.
# Default: /var/log/newrelic/newrelic-daemon.log
#logfile=/var/log/newrelic/newrelic-daemon.log
<%- if @newrelic_daemon_logfile -%>
logfile=<%= @newrelic_daemon_logfile %>
<%- end -%>
#
# Setting: loglevel
......@@ -78,32 +84,72 @@ logfile=<%= @newrelic_daemon_logfile %>
# debug - very verbose, includes messages only relevant to support
# verbosedebug - extremely verbose, creates massive log files
# Default: info
#loglevel=info
<%- if @newrelic_daemon_loglevel -%>
loglevel=<%= @newrelic_daemon_loglevel %>
<%- end -%>
#
# Setting: port
# Type : Integer (1-65534)
# Purpose: Sets the TCP port on which the daemon will listen for connections
# from agents (agents in this case includes Apache / php-fpm worker
# processes, the command line, or any other agent source). In order
# to use a port in the range 1-1023, the daemon must be started by
# the super-user. This is a fundamental OS limitation and not one
# imposed by the daemon itself.
# Default: 33142
# Type : String or Integer (1-65534)
# Purpose: Sets how the agent and daemon communicate. How this is set can impact
# performance. The default is to use a UNIX-domain socket located at
# /tmp/.newrelic.sock. If you want to use UNIX domain sockets then
# this value must begin with a "/". If you set this to an integer
# value in the range 1-65534, then this will instruct the daemon to
# listen on a normal TCP socket on the port specified. This may be
# easier to use if you are using a chroot environment.
# In order to use a port in the range 1-1023, the daemon must be
# started by the super-user. This is a fundamental OS limitation
# and not one imposed by the daemon itself.
# Default: "/tmp/.newrelic.sock"
#port="/tmp/.newrelic.sock"
<%- if @newrelic_daemon_port -%>
port=<%= @newrelic_daemon_port %>
<%- end -%>
#
# Setting: ssl
# Type : boolean
# Purpose: If you prefer the daemon to use the secure HTTP (https) protocol
# when communicating with the New Relic collector servers, set this
# to true. Please note that in order for this to work the daemon must
# be able to find a Certificate Authority (CA) list. On startup the
# daemon will attempt to find such a list in the usual places, but
# you may need to use the ssl_ca_bundle or ssl_ca_path variables
# below.
# Default: false
# to true.
# Default: true (as of version 3.6)
#ssl=true
<%- if @newrelic_daemon_ssl -%>
ssl=<%= @newrelic_daemon_ssl %>
<%- end -%>
#
# Setting: ssl_ca_bundle
# Type : string
# Purpose: Sets the location of a file containing CA certificates in PEM
# format. When set, the certificates in this file will be used
# to authenticate the New Relic collector servers. If ssl_ca_path
# is also set (see below), the certificates in this file will be
# searched first, followed by the certificates contained in the
# ssl_ca_path directory. This setting has no effect when ssl
# is set to false.
# Default: none
#ssl_ca_bundle=
<%- if @newrelic_daemon_ssl_ca_bundle -%>
ssl_ca_bundle=<%= @newrelic_daemon_ssl_ca_bundle %>
<%- end -%>
#
# Setting: ssl_ca_path
# Type : string
# Purpose: Sets the location of a directory containing trusted CA certificates
# in PEM format. When set, the certificates in this directory will be
# used to authenticate the New Relic collector servers. If
# ssl_ca_bundle is also set (see above), it will be searched first
# followed by the certificates contained in ssl_ca_path. This
# setting has no effect when ssl is set to false.
# Default: none
#ssl_ca_path=
<%- if @newrelic_daemon_ssl_ca_path -%>
ssl_ca_path=<%= @newrelic_daemon_ssl_ca_path %>
<%- end -%>
#
# Setting: proxy
......@@ -120,41 +166,10 @@ ssl=<%= @newrelic_daemon_ssl %>
# someuser@proxy.mydomain.com:4321
# proxy.mydomain.com
# Default: none
#proxy=
<%- if @newrelic_daemon_proxy -%>
proxy=<%= @newrelic_daemon_proxy %>
#
# Setting: ssl_ca_bundle
# Type : string
# Purpose: If you have the "ssl" option above enabled, and the daemon cannot
# find a suitable Certificate Authority (CA) list, this is one of the
# options you can use to point it to the CA list to use. If your SSL
# installation uses a "bundle" - i.e. a single file which contains a
# list of CA's - then this option should point to that bundle file.
# Default: Looks for one of two files: /etc/pki/tls/certs/ca-bundle.crt or
# /etc/ssl/certs/ca-certificates.crt.
#
ssl_ca_bundle=<%= @newrelic_daemon_ssl_ca_bundle %>
#
# Setting: ssl_ca_path
# Type : string
# Purpose: See ssl_ca_bundle above. This option should be used if your SSL
# installation uses a sub-directory with a list of CA certificates.
# Set this variable to point to that directory.
# Default: /etc/ssl/certs
ssl_ca_path=<%= @newrelic_daemon_ssl_ca_path %>
#
# Setting: max_threads
# Type : integer (4-128)
# Purpose: Internally the daemon uses a "pool" of worker threads to deal with
# activity from each connected agent. In certain very busy setups
# you may need to increase this number in order to service all of
# those connections quickly enough. Each extra thread you create does
# have resource usage (memory, CPU etc.) implications so do not just
# increase this arbitrarily.
# Default: 8
max_threads=<%= @newrelic_daemon_max_threads %>
<%- end -%>
#
# Setting: collector_host
......@@ -166,4 +181,24 @@ max_threads=<%= @newrelic_daemon_max_threads %>
# circumstances, and then only on instruction from a New Relic sales
# person or support staff member.
# Default: collector.newrelic.com
#collector_host=collector.newrelic.com
<%- if @newrelic_daemon_collector_host -%>
collector_host=<%= @newrelic_daemon_collector_host %>
<%- end -%>
#
# Setting: auditlog
# Type : string
# Purpose: Sets the name of a file to record all uncompressed, un-encoded
# content that is sent from your machine to the New Relic servers.
# This includes the full URL for each command along with the payload
# delivered with the command. This allows you to satisfy yourself
# that the agent is not sending any sensitive data to our servers.
# This file must be a different file to the logfile setting above.
# If you set it to the same name audit logging will be silently
# ignored.
# Default: None
#auditlog=/var/log/newrelic/audit.log
<%- if @newrelic_daemon_auditlog -%>
auditlog=<%= @newrelic_daemon_auditlog %>
<%- end -%>
This diff is collapsed.