diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d4a42d..1a5fbe5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.
+
+
+
resource file that contains $USERx$ macro definitions.
+resource file that contains $USERx$ macro +definitions.
0 and
max amount of time (in seconds) +that a single # check result reaper event +will be allowed to run before +returning control back to Nagios so it can +perform other duties.
+-357 -358 -359 -360 361 362 363 @@ -3326,10 +3266,14 @@ rescheduled. 604 605 606 -607+607 +608 +609 +610 +611
# File 'manifests/params.pp', line 357 +# File 'manifests/params.pp', line 361 class cd_nagios::params ( @@ -3589,7 +3533,7 @@ $ng_target_command = "${ng_conf_d_dir}/nagios_command.cfg" diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index 568d40c..afc8b75 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -249,7 +249,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index 2591d9e..3ed7c28 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -195,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 6c67318..116a6f9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -334,7 +334,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index f36cbab..7d688e5 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -266,7 +266,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index edb95a1..5c7ac66 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 83c2d6b..5a3d5f2 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ diff --git a/manifests/params.pp b/manifests/params.pp index b1d84a8..f8702be 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -219,8 +219,9 @@ # cached when # Nagios starts/restarts. # @param [string] ng_precached_obj_file determines the location of the # precached object file. -# @param [string] optional resource file that contains $USERx$ macro definitions. -# @param [string] ng_status_file. where the current status of all monitored +# @param [string] ng_resource_file resource file that contains $USERx$ macro +# definitions. +# @param [string] ng_status_file where the current status of all monitored # services and hosts is stored. # @param [string] ng_status_upd_interval status file update interval. # determines the frequency (in seconds) that # Nagios will periodically dump @@ -241,12 +242,12 @@ # when Nagios # updates the status log, cleans the comment file, etc. # @param [string] ng_temp_path path where Nagios can create temp files for # service and # host check results, etc. -# @param [string] event_broker_options Controls what (if any) data gets sent +# @param [string] ng_event_broker_options Controls what (if any) data gets sent # to the event broker. # @param [string] ng_event_broker_module specify an event broker # (including full path) module that should # by loaded by Nagios at startup. # Specify multiple modules as array ['path/to/module1','/path/to/module2'] -# @param [string] ng_log_rotation_method. Valid options: +# @param [string] ng_log_rotation_method Valid options: # n = None - don't rotate the log # h = Hourly rotation (top of the hour) # d = Daily rotation (midnight every day) @@ -262,7 +263,7 @@ # Valid options are `0` and `1`. # @param [string] ng_log_host_retries Whether to log host retries. # Valid options are `0` and `1`. -# @param [string] ng_log_event_handlers. Whether to log host and service event +# @param [string] ng_log_event_handlers Whether to log host and service event # handlers. Valid options are `0` and `1`. # @param [string] ng_log_initial_states Whether to log initial states. # Valid options are `0` and `1`. @@ -292,7 +293,7 @@ # d = Use a "dumb" delay of 1 second between checks # s = Use "smart" inter-check delay calculation # x.xx = Use an inter-check delay of x.xx seconds -# @param [string] ng_max_service_check_spread timeframe (in minutes) from the +# @param [string] ng_max_svc_check_spread timeframe (in minutes) from the # program start time that an initial check of all services should be completed # @param [string] ng_svc_interleave_factor determines how service checks are # interleaved. Valid options: s = Use "smart" interleave factor calculation @@ -311,6 +312,9 @@ # will not restrict the number of concurrent checks that are being executed. # @param [string] ng_check_res_reaper_freq frequency (in seconds!) in which # Nagios will process the results of host and service checks. +# @param [string] ng_max_check_res_reap_time max amount of time (in seconds) +# that a single # check result reaper event will be allowed to run before +# returning control back to Nagios so it can perform other duties. # @param [string] ng_check_result_path directory where Nagios stores the # results of host and service checks that have not yet been processed. # @param [string] ng_max_check_res_file_age maximum age (in seconds) which