recommit for updates in build 143

This commit is contained in:
2017-07-28 15:24:01 +02:00
parent 3dbbca47d8
commit 08fd1fcb5c
38 changed files with 406 additions and 348 deletions

View File

@@ -139,7 +139,7 @@ class cd_nagios {
</div>
<div id="footer">
Generated on Fri Jul 28 14:20:44 2017 by
Generated on Fri Jul 28 15:23: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

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
</div>
<div id="footer">
Generated on Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:55 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

@@ -243,7 +243,10 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
136
137
138
139</pre>
139
140
141
142</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/client/target.pp', line 23</span>
@@ -254,114 +257,117 @@ class cd_nagios::client::target (
) inherits cd_nagios::params {
if $::fqdn != $ng_nagios_server {
if $ng_include_nrpe == true {
require cd_nagios::main::install
require cd_nagios::main::user
require cd_nrpe
@@nagios_host { $::fqdn:
ensure =&gt; $ng_ping_ensure,
alias =&gt; $::hostname,
address =&gt; $::fqdn,
use =&gt; &#39;linux-server&#39;,
target =&gt; $ng_target_host,
hostgroups =&gt; &#39;linux-servers&#39;,
contacts =&gt; &#39;ops&#39;,
max_check_attempts =&gt; $ng_max_check_attempts,
notification_period =&gt; &#39;24x7&#39;,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
check_command =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
notify =&gt; Service[$ng_user],
}
@@nagios_host { $::fqdn:
ensure =&gt; $ng_ping_ensure,
alias =&gt; $::hostname,
address =&gt; $::fqdn,
use =&gt; &#39;linux-server&#39;,
target =&gt; $ng_target_host,
hostgroups =&gt; &#39;linux-servers&#39;,
contacts =&gt; &#39;ops&#39;,
max_check_attempts =&gt; $ng_max_check_attempts,
notification_period =&gt; &#39;24x7&#39;,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
check_command =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
notify =&gt; Service[$ng_user],
}
@@nagios_service { &quot;root_partition_${::hostname}&quot;:
ensure =&gt; $ng_disk_ensure,
check_command =&gt; &quot;check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_root_partition&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@nagios_service { &quot;root_partition_${::hostname}&quot;:
ensure =&gt; $ng_disk_ensure,
check_command =&gt; &quot;check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_root_partition&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@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;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_swap_usage&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@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;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_swap_usage&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@nagios_service { &quot;Local_Users_${::hostname}&quot;:
ensure =&gt; $ng_users_ensure,
check_command =&gt; &quot;check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_local_users&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@nagios_service { &quot;Local_Users_${::hostname}&quot;:
ensure =&gt; $ng_users_ensure,
check_command =&gt; &quot;check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_local_users&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@nagios_service { &quot;Total Processes_${::hostname}&quot;:
ensure =&gt; $ng_procs_tot_ens,
check_command =&gt; &quot;check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_total_processes&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@nagios_service { &quot;Total Processes_${::hostname}&quot;:
ensure =&gt; $ng_procs_tot_ens,
check_command =&gt; &quot;check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_total_processes&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@nagios_service { &quot;Zombie Processes_${::hostname}&quot;:
ensure =&gt; $ng_procs_z_ensure,
check_command =&gt; &quot;check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_zombie_processes&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@nagios_service { &quot;Zombie Processes_${::hostname}&quot;:
ensure =&gt; $ng_procs_z_ensure,
check_command =&gt; &quot;check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_zombie_processes&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
@@nagios_service { &quot;Current_Load_${::hostname}&quot;:
ensure =&gt; $ng_load_ensure,
check_command =&gt; &quot;check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_current_load&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
@@nagios_service { &quot;Current_Load_${::hostname}&quot;:
ensure =&gt; $ng_load_ensure,
check_command =&gt; &quot;check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
contacts =&gt; &#39;ops&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${::hostname}_current_load&quot;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
}
}
}
}</pre>
@@ -372,7 +378,7 @@ class cd_nagios::client::target (
</div>
<div id="footer">
Generated on Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:55 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 Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:56 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 Fri Jul 28 14:20:47 2017 by
Generated on Fri Jul 28 15:23:55 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 Fri Jul 28 14:20:47 2017 by
Generated on Fri Jul 28 15:23:55 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

@@ -165,18 +165,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70</pre>
59</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 24</span>
@@ -201,15 +190,6 @@ class cd_nagios::main::install (
package {$reqpackages_client:
ensure =&gt; $pkg_ensure,
}
# install NRPE if enabled
if $ng_include_nrpe == true {
package {$reqpackages_nrpe:
ensure =&gt; $pkg_ensure,
}
}
}
# if we are not the nagios server, install client packages
@@ -222,9 +202,7 @@ class cd_nagios::main::install (
# if we want to use NRPE, install it
if $ng_include_nrpe == true {
package {$reqpackages_nrpe:
ensure =&gt; $pkg_ensure,
}
require cd_nrpe
}
}
}</pre>
@@ -235,7 +213,7 @@ class cd_nagios::main::install (
</div>
<div id="footer">
Generated on Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:55 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

@@ -200,7 +200,7 @@ class cd_nagios::main::user (
</div>
<div id="footer">
Generated on Fri Jul 28 14:20:47 2017 by
Generated on Fri Jul 28 15:23:55 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:57 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:57 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:57 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:57 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:57 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 Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:56 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 Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:56 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:56 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:56 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:56 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:57 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:57 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 Fri Jul 28 14:20:49 2017 by
Generated on Fri Jul 28 15:23:56 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

@@ -4871,6 +4871,25 @@ rampup_limit - Minimum
rampup_change
rampup_change - # of jobs to add to jobs_limit when ramping
up</p>
</div>
</li>
<li>
<span class='name'>ng_nrpe_port</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;5666&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the port for NRPE. used by firewall and in
configuration file.</p>
</div>
</li>
@@ -4892,8 +4911,6 @@ up</p>
<pre class="lines">
646
647
648
649
650
@@ -5245,10 +5262,13 @@ up</p>
996
997
998
999</pre>
999
1000
1001
1002</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 646</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 648</span>
class cd_nagios::params (
@@ -5268,6 +5288,7 @@ $ng_http_https_fw = true,
$ng_fw_order = &#39;50&#39;,
$ng_http_port = &#39;80&#39;,
$ng_https_port = &#39;443&#39;,
$ng_nrpe_port = &#39;5666&#39;,
# check command parameters
## ping
@@ -5514,9 +5535,6 @@ $ng_loadctl_options = &#39;jobs_max=100;backoff_limit=10;rampup_change=5
&#39;nagios-plugins-nrpe&#39;,
&#39;nagios-common&#39;]
}
$reqpackages_nrpe = $::operatingsystem ? {
/(?i-mx:centos|fedora|redhat)/ =&gt; [&#39;nrpe&#39;]
}
# service
$ng_service = &#39;nagios&#39;
@@ -5599,6 +5617,9 @@ $ng_cntctgrps_rule_erb = &#39;cd_nagios/nagios/contactgroups_cfg_rule.erb&#
$ng_target_command = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot;
$ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;
# nrpe
$ng_nrpe_file = &quot;${ng_main_dir}/nrpe.cfg&quot;
# includes must be last
include cd_nagios::main::config
@@ -5611,7 +5632,7 @@ $ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/us
</div>
<div id="footer">
Generated on Fri Jul 28 14:20:47 2017 by
Generated on Fri Jul 28 15:23:55 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

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
</div>
<div id="footer">
Generated on Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:56 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 Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:56 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 Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:55 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

@@ -304,7 +304,7 @@ class cd_nagios::server::service (
</div>
<div id="footer">
Generated on Fri Jul 28 14:20:48 2017 by
Generated on Fri Jul 28 15:23:56 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>