From 11d478e13b89c8e0ecb2031eb084445fa2902e88 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Mon, 24 Jul 2017 16:25:26 +0100 Subject: [PATCH 1/2] fixing parameter documentation --- manifests/params.pp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 From 449f2f7825b0d881c8a22b64b622d476394cebff Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Mon, 24 Jul 2017 17:25:38 +0200 Subject: [PATCH 2/2] recommit for updates in build 68 --- CHANGELOG.md | 15 ++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 154 ++++++------------ .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 19 files changed, 81 insertions(+), 122 deletions(-) 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.

No issue

+f4daf7fcf0ae6fa Jenkins Server 2017-07-24 15:04:22 +

+

recommit for updates in build 67

+ +

+20d67e00bc493b5 Arne Teuke 2017-07-24 15:04:06 +

+

adding more parameters

+ +

+9602eb550c41f17 Arne Teuke 2017-07-24 15:00:07 +

+

adding more parameters

+ +

5ff13eb48507109 Jenkins Server 2017-07-24 11:07:40

recommit for updates in build 65

diff --git a/doc/_index.html b/doc/_index.html index 0aaddc3..5f3b402 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -186,7 +186,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 3f0c3c2..b93d4df 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -333,7 +333,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index c49dab0..d92b47b 100644 --- a/doc/index.html +++ b/doc/index.html @@ -333,7 +333,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index e061ed5..94679d1 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html index 3a43c1a..9d5157f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html @@ -230,7 +230,7 @@ class cd_nagios::certbot::certs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 56d9a3f..f7d85a2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 0c015ed..53acb27 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index bedea58..a5919d0 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -195,7 +195,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 79726d6..3202575 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index f4b7951..8343570 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 7d2a64d..39413b1 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 7bc6170..0980d09 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2040,28 +2040,33 @@ precached object file.

  • - optional + ng_resource_file (string) + (defaults to: '/etc/nagios/private/resource.cfg') + —
    -

    resource file that contains $USERx$ macro definitions.

    +

    resource file that contains $USERx$ macro +definitions.

  • - ng_status_file. + ng_status_file (string) + (defaults to: '/var/log/nagios/status.dat') + —
    @@ -2235,12 +2240,14 @@ results, etc.

  • - event_broker_options + ng_event_broker_options (string) + (defaults to: '-1') + —
    @@ -2274,12 +2281,14 @@ Specify multiple modules as array
  • - ng_log_rotation_method. + ng_log_rotation_method (string) + (defaults to: 'h') + —
    @@ -2398,12 +2407,14 @@ Valid options are 0 and
  • - ng_log_event_handlers. + ng_log_event_handlers (string) + (defaults to: '1') + —
    @@ -2582,12 +2593,14 @@ x.xx = Use an inter-check delay of x.xx seconds

  • - ng_max_service_check_spread + ng_max_svc_check_spread (string) + (defaults to: '30') + —
    @@ -2710,6 +2723,28 @@ and service checks.

    • +
  • + + ng_max_check_res_reap_time + + + (string) + + + (defaults to: '30') + + + — +
    +

    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.

    +
    + +
    • +
  • ng_check_result_path @@ -2968,97 +3003,6 @@ rescheduled.

    • -
  • - - ng_resource_file - - - (Any) - - - (defaults to: '/etc/nagios/private/resource.cfg') - - -
    • - -
  • - - ng_status_file - - - (Any) - - - (defaults to: '/var/log/nagios/status.dat') - - -
    • - -
  • - - ng_event_broker_options - - - (Any) - - - (defaults to: '-1') - - -
    • - -
  • - - ng_log_rotation_method - - - (Any) - - - (defaults to: 'h') - - -
    • - -
  • - - ng_log_event_handlers - - - (Any) - - - (defaults to: '1') - - -
    • - -
  • - - ng_max_svc_check_spread - - - (Any) - - - (defaults to: '30') - - -
    • - -
  • - - ng_max_check_res_reap_time - - - (Any) - - - (defaults to: '30') - - -
    • - @@ -3076,10 +3020,6 @@ rescheduled.

     
 
-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 @@