confdroid/confdroid_nagios
3
0
Fork 0
Code Issues Projects Wiki Activity

Merge branch 'jenkins' into 'master'

Browse Source 
Jenkins

See merge request !43
This commit is contained in:
12ww1160
2017-07-25 10:51:47 +02:00
parent dc0fb37340 449f2f7825
commit 5dd1174967
20 changed files with 91 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CHANGELOG.md
View File

@@ -8,6 +8,21 @@ Changelog of Git Changelog.
<h2> No issue </h2> <h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/f4daf7fcf0ae6fa">f4daf7fcf0ae6fa</a> Jenkins Server <i>2017-07-24 15:04:22</i>
<p>
<h3>recommit for updates in build 67</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/20d67e00bc493b5">20d67e00bc493b5</a> Arne Teuke <i>2017-07-24 15:04:06</i>
<p>
<h3>adding more parameters</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/9602eb550c41f17">9602eb550c41f17</a> Arne Teuke <i>2017-07-24 15:00:07</i>
<p>
<h3>adding more parameters</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5ff13eb48507109">5ff13eb48507109</a> Jenkins Server <i>2017-07-24 11:07:40</i> <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5ff13eb48507109">5ff13eb48507109</a> Jenkins Server <i>2017-07-24 11:07:40</i>
<p> <p>
<h3>recommit for updates in build 65</h3> <h3>recommit for updates in build 65</h3>

2
doc/_index.html
View File

@@ -186,7 +186,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:14 2017 by Generated on Mon Jul 24 17:25:31 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/file.README.html
View File

@@ -333,7 +333,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:16 2017 by Generated on Mon Jul 24 17:25:32 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/index.html
View File

@@ -333,7 +333,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:15 2017 by Generated on Mon Jul 24 17:25:31 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios.html
View File

@@ -139,7 +139,7 @@ class cd_nagios {
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:16 2017 by Generated on Mon Jul 24 17:25:32 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
View File

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:19 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
View File

@@ -368,7 +368,7 @@ class cd_nagios::client::target (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:19 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
View File

@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:19 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
View File

@@ -195,7 +195,7 @@ class cd_nagios::main::config (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:19 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
View File

@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:18 2017 by Generated on Mon Jul 24 17:25:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
View File

@@ -235,7 +235,7 @@ class cd_nagios::main::install (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:19 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
View File

@@ -200,7 +200,7 @@ class cd_nagios::main::user (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:18 2017 by Generated on Mon Jul 24 17:25:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

154
doc/puppet_classes/cd_nagios_3A_3Aparams.html
View File

@@ -2040,28 +2040,33 @@ precached object file.</p>
<li> <li>
<span class='name'>optional</span> <span class='name'>ng_resource_file</span>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/nagios/private/resource.cfg&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
<p>resource file that contains $USERx$ macro definitions.</p> <p>resource file that contains $USERx$ macro
definitions.</p>
</div> </div>
</li> </li>
<li> <li>
<span class='name'>ng_status_file.</span> <span class='name'>ng_status_file</span>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/var/log/nagios/status.dat&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -2235,12 +2240,14 @@ results, etc.</p>
<li> <li>
<span class='name'>event_broker_options</span> <span class='name'>ng_event_broker_options</span>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;-1&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -2274,12 +2281,14 @@ Specify multiple modules as array
<li> <li>
<span class='name'>ng_log_rotation_method.</span> <span class='name'>ng_log_rotation_method</span>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;h&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -2398,12 +2407,14 @@ Valid options are <code>0</code> and
<li> <li>
<span class='name'>ng_log_event_handlers.</span> <span class='name'>ng_log_event_handlers</span>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -2582,12 +2593,14 @@ x.xx = Use an inter-check delay of x.xx seconds</p>
<li> <li>
<span class='name'>ng_max_service_check_spread</span> <span class='name'>ng_max_svc_check_spread</span>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -2710,6 +2723,28 @@ and service checks.</p>
</li> </li>
<li>
<span class='name'>ng_max_check_res_reap_time</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>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.</p>
</div>
</li>
<li> <li>
<span class='name'>ng_check_result_path</span> <span class='name'>ng_check_result_path</span>
@@ -2968,97 +3003,6 @@ rescheduled.</p>
</li> </li>
<li>
<span class='name'>ng_resource_file</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/nagios/private/resource.cfg&#39;</tt>)</em>
</li>
<li>
<span class='name'>ng_status_file</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/var/log/nagios/status.dat&#39;</tt>)</em>
</li>
<li>
<span class='name'>ng_event_broker_options</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;-1&#39;</tt>)</em>
</li>
<li>
<span class='name'>ng_log_rotation_method</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;h&#39;</tt>)</em>
</li>
<li>
<span class='name'>ng_log_event_handlers</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
</li>
<li>
<span class='name'>ng_max_svc_check_spread</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em>
</li>
<li>
<span class='name'>ng_max_check_res_reap_time</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em>
</li>
</ul> </ul>
@@ -3076,10 +3020,6 @@ rescheduled.</p>
<pre class="lines"> <pre class="lines">
357
358
359
360
361 361
362 362
363 363
@@ -3326,10 +3266,14 @@ rescheduled.</p>
604 604
605 605
606 606
607</pre> 607
608
609
610
611</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 357</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 361</span>
class cd_nagios::params ( class cd_nagios::params (
@@ -3589,7 +3533,7 @@ $ng_target_command = &quot;${ng_conf_d_dir}/nagios_command.cfg&quot;
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:18 2017 by Generated on Mon Jul 24 17:25:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
View File

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:19 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
View File

@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:19 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
View File

@@ -334,7 +334,7 @@ class cd_nagios::server::files (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:19 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
View File

@@ -266,7 +266,7 @@ class cd_nagios::server::service (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:19 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
View File

@@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:20 2017 by Generated on Mon Jul 24 17:25:35 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/top-level-namespace.html
View File

@@ -90,7 +90,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Mon Jul 24 17:04:16 2017 by Generated on Mon Jul 24 17:25:32 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

16
manifests/params.pp
View File

@@ -219,8 +219,9 @@
# cached when # Nagios starts/restarts. # cached when # Nagios starts/restarts.
# @param [string] ng_precached_obj_file determines the location of the # @param [string] ng_precached_obj_file determines the location of the
# precached object file. # precached object file.
# @param [string] optional resource file that contains $USERx$ macro definitions. # @param [string] ng_resource_file resource file that contains $USERx$ macro
# @param [string] ng_status_file. where the current status of all monitored # definitions.
# @param [string] ng_status_file where the current status of all monitored
# services and hosts is stored. # services and hosts is stored.
# @param [string] ng_status_upd_interval status file update interval. # @param [string] ng_status_upd_interval status file update interval.
# determines the frequency (in seconds) that # Nagios will periodically dump # 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. # when Nagios # updates the status log, cleans the comment file, etc.
# @param [string] ng_temp_path path where Nagios can create temp files for # @param [string] ng_temp_path path where Nagios can create temp files for
# service and # host check results, etc. # 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. # to the event broker.
# @param [string] ng_event_broker_module specify an event broker # @param [string] ng_event_broker_module specify an event broker
# (including full path) module that should # by loaded by Nagios at startup. # (including full path) module that should # by loaded by Nagios at startup.
# Specify multiple modules as array ['path/to/module1','/path/to/module2'] # 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 # n = None - don't rotate the log
# h = Hourly rotation (top of the hour) # h = Hourly rotation (top of the hour)
# d = Daily rotation (midnight every day) # d = Daily rotation (midnight every day)
@@ -262,7 +263,7 @@
# Valid options are `0` and `1`. # Valid options are `0` and `1`.
# @param [string] ng_log_host_retries Whether to log host retries. # @param [string] ng_log_host_retries Whether to log host retries.
# Valid options are `0` and `1`. # 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`. # handlers. Valid options are `0` and `1`.
# @param [string] ng_log_initial_states Whether to log initial states. # @param [string] ng_log_initial_states Whether to log initial states.
# Valid options are `0` and `1`. # Valid options are `0` and `1`.
@@ -292,7 +293,7 @@
# d = Use a "dumb" delay of 1 second between checks # d = Use a "dumb" delay of 1 second between checks
# s = Use "smart" inter-check delay calculation # s = Use "smart" inter-check delay calculation
# x.xx = Use an inter-check delay of x.xx seconds # 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 # program start time that an initial check of all services should be completed
# @param [string] ng_svc_interleave_factor determines how service checks are # @param [string] ng_svc_interleave_factor determines how service checks are
# interleaved. Valid options: s = Use "smart" interleave factor calculation # 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. # will not restrict the number of concurrent checks that are being executed.
# @param [string] ng_check_res_reaper_freq frequency (in seconds!) in which # @param [string] ng_check_res_reaper_freq frequency (in seconds!) in which
# Nagios will process the results of host and service checks. # 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 # @param [string] ng_check_result_path directory where Nagios stores the
# results of host and service checks that have not yet been processed. # 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 # @param [string] ng_max_check_res_file_age maximum age (in seconds) which