Merge branch 'jenkins' into 'master'

Jenkins

See merge request !90
This commit is contained in:
12ww1160
2017-07-31 18:15:55 +02:00
41 changed files with 114 additions and 48 deletions

View File

@@ -8,6 +8,21 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/459b0abe3f17ca8">459b0abe3f17ca8</a> Jenkins Server <i>2017-07-30 19:38:33</i>
<p>
<h3>recommit for updates in build 152</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d12abd7cd16065d">d12abd7cd16065d</a> Arne Teuke <i>2017-07-30 19:38:00</i>
<p>
<h3>updating README</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/93b47c0f012bb71">93b47c0f012bb71</a> Arne Teuke <i>2017-07-30 19:34:53</i>
<p>
<h3>updating README</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/0b459b63e6dff1b">0b459b63e6dff1b</a> Jenkins Server <i>2017-07-30 15:00:59</i>
<p>
<h3>recommit for updates in build 150</h3>

View File

@@ -1,6 +1,6 @@
|Repo Name| version | Build Status|
|---|---|---|---|
|`cd_nagios`| 0.0.1.5 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)|
|`cd_nagios`| 0.0.1.6 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)|
### Synopsis
Nagios is a powerful open source software solution for monitoring your IT environments.

View File

@@ -281,7 +281,7 @@
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:18 2017 by
Generated on Mon Jul 31 18:26:44 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build
Status|
|---|---|---|---|
|<code>cd_nagios</code>| 0.0.1.5 | <a
|<code>cd_nagios</code>| 0.0.1.6 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
Status</a>/]|</p>
@@ -404,7 +404,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Sun Jul 30 21:38:20 2017 by
Generated on Mon Jul 31 18:26:46 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build
Status|
|---|---|---|---|
|<code>cd_nagios</code>| 0.0.1.5 | <a
|<code>cd_nagios</code>| 0.0.1.6 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
Status</a>/]|</p>
@@ -404,7 +404,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Sun Jul 30 21:38:19 2017 by
Generated on Mon Jul 31 18:26:45 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -139,7 +139,7 @@ class cd_nagios {
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:20 2017 by
Generated on Mon Jul 31 18:26:46 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:24 2017 by
Generated on Mon Jul 31 18:26:50 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -246,7 +246,10 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
139
140
141
142</pre>
142
143
144
145</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/client/target.pp', line 23</span>
@@ -294,6 +297,8 @@ class cd_nagios::client::target (
mode =&gt; &#39;0640&#39;,
}
if $ng_enable_swap_check == true {
@@nagios_service { &quot;Swap_Usage_${::hostname}&quot;:
ensure =&gt; $ng_swap_ensure,
check_command =&gt; &quot;check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}&quot;,
@@ -308,6 +313,7 @@ class cd_nagios::client::target (
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
}
@@nagios_service { &quot;Local_Users_${::hostname}&quot;:
ensure =&gt; $ng_users_ensure,
@@ -378,7 +384,7 @@ class cd_nagios::client::target (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:24 2017 by
Generated on Mon Jul 31 18:26:50 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:25 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -195,7 +195,7 @@ class cd_nagios::main::config (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:24 2017 by
Generated on Mon Jul 31 18:26:50 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

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

View File

@@ -213,7 +213,7 @@ class cd_nagios::main::install (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:24 2017 by
Generated on Mon Jul 31 18:26:50 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -194,7 +194,7 @@ class cd_nagios::main::user (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:24 2017 by
Generated on Mon Jul 31 18:26:50 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -217,7 +217,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:26 2017 by
Generated on Mon Jul 31 18:26:52 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -215,7 +215,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:26 2017 by
Generated on Mon Jul 31 18:26:52 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:26 2017 by
Generated on Mon Jul 31 18:26:52 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_servicegroup_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:26 2017 by
Generated on Mon Jul 31 18:26:52 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -222,7 +222,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:26 2017 by
Generated on Mon Jul 31 18:26:52 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -597,7 +597,7 @@ class cd_nagios::nagios::objects::commands (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:25 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -182,7 +182,7 @@ class cd_nagios::nagios::objects::config (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:25 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:26 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:25 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:25 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -235,7 +235,7 @@ class cd_nagios::nagios::objects::servicegroups (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:26 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -305,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:26 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -285,7 +285,7 @@ class cd_nagios::nagios::objects::timeperiods (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:25 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -4890,6 +4890,31 @@ up</p>
<div class='inline'>
<p>the port for NRPE. used by firewall and in
configuration file.</p>
</div>
</li>
<li>
<span class='name'>ng_enable_swap_check</span>
<span class='type'>(<tt>boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to enable the declaration of
the swap check. Disabling thi smakes
sense when you use the <code>cd_swap</code>
Puppet module and have enabled
the check declaration from there, so the
Nagios check is properly aligned
to the Puppet module controlling the
particular item.</p>
</div>
</li>
@@ -4911,11 +4936,6 @@ configuration file.</p>
<pre class="lines">
648
649
650
651
652
653
654
655
@@ -5265,10 +5285,19 @@ configuration file.</p>
999
1000
1001
1002</pre>
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 648</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 653</span>
class cd_nagios::params (
@@ -5521,6 +5550,10 @@ $ng_host_down_svc_checks = &#39;0&#39;,
$ng_enable_load_ctl_options = false,
$ng_loadctl_options = &#39;jobs_max=100;backoff_limit=10;rampup_change=5&#39;,
# single nagios checks
$ng_enable_swap_check = true,
) {
# installation section
@@ -5632,7 +5665,7 @@ $ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/us
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:24 2017 by
Generated on Mon Jul 31 18:26:50 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -324,7 +324,7 @@ class cd_nagios::selinux::config (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:25 2017 by
Generated on Mon Jul 31 18:26:50 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:25 2017 by
Generated on Mon Jul 31 18:26:51 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -334,7 +334,7 @@ class cd_nagios::server::files (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:24 2017 by
Generated on Mon Jul 31 18:26:50 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -310,7 +310,7 @@ class cd_nagios::server::service (
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:25 2017 by
Generated on Mon Jul 31 18:26:50 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -285,7 +285,7 @@ $ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:27 2017 by
Generated on Mon Jul 31 18:26:53 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -237,7 +237,7 @@ $ng_cntctgrps_rule_erb = $::cd_nagios::params::ng_cntctgrps_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:27 2017 by
Generated on Mon Jul 31 18:26:53 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -245,7 +245,7 @@ $ng_tgt_hostgrp_rule_erb = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:27 2017 by
Generated on Mon Jul 31 18:26:53 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -245,7 +245,7 @@ $ng_tgt_svcgrp_rule_erb = $::cd_nagios::params::ng_tgt_svcgrp_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:28 2017 by
Generated on Mon Jul 31 18:26:53 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -370,7 +370,7 @@ $ng_tgt_timep_rule_erb = $::cd_nagios::params::ng_tgt_timep_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:27 2017 by
Generated on Mon Jul 31 18:26:53 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -906,7 +906,7 @@ $ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:27 2017 by
Generated on Mon Jul 31 18:26:53 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:26 2017 by
Generated on Mon Jul 31 18:26:52 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -90,7 +90,7 @@
</div>
<div id="footer">
Generated on Sun Jul 30 21:38:20 2017 by
Generated on Mon Jul 31 18:26:46 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -63,6 +63,8 @@ class cd_nagios::client::target (
mode => '0640',
}
if $ng_enable_swap_check == true {
@@nagios_service { "Swap_Usage_${::hostname}":
ensure => $ng_swap_ensure,
check_command => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
@@ -77,6 +79,7 @@ class cd_nagios::client::target (
group => $ng_user,
mode => '0640',
}
}
@@nagios_service { "Local_Users_${::hostname}":
ensure => $ng_users_ensure,

View File

@@ -644,6 +644,11 @@
# rampup_change - # of jobs to add to jobs_limit when ramping up
# @param [string] ng_nrpe_port the port for NRPE. used by firewall and in
# configuration file.
# @param [boolean] ng_enable_swap_check Whether to enable the declaration of
# the swap check. Disabling thi smakes sense when you use the `cd_swap`
# Puppet module and have enabled the check declaration from there, so the
# Nagios check is properly aligned to the Puppet module controlling the
# particular item.
###############################################################################
class cd_nagios::params (
@@ -896,6 +901,10 @@ $ng_host_down_svc_checks = '0',
$ng_enable_load_ctl_options = false,
$ng_loadctl_options = 'jobs_max=100;backoff_limit=10;rampup_change=5',
# single nagios checks
$ng_enable_swap_check = true,
) {
# installation section