recommit for updates in build 67

This commit is contained in:
2017-07-24 17:04:22 +02:00
parent fab53d6012
commit f4daf7fcf0
21 changed files with 1679 additions and 329 deletions

View File

@@ -139,7 +139,7 @@ class cd_nagios {
</div>
<div id="footer">
Generated on Mon Jul 24 13:07:36 2017 by
Generated on Mon Jul 24 17:04:16 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 Mon Jul 24 13:07:38 2017 by
Generated on Mon Jul 24 17:04:19 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

@@ -368,7 +368,7 @@ class cd_nagios::client::target (
</div>
<div id="footer">
Generated on Mon Jul 24 13:07:38 2017 by
Generated on Mon Jul 24 17:04:19 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 Mon Jul 24 13:07:38 2017 by
Generated on Mon Jul 24 17:04:19 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 Mon Jul 24 13:07:37 2017 by
Generated on Mon Jul 24 17:04:19 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 Mon Jul 24 13:07:37 2017 by
Generated on Mon Jul 24 17:04:18 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::main::install (
</div>
<div id="footer">
Generated on Mon Jul 24 13:07:37 2017 by
Generated on Mon Jul 24 17:04:19 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 Mon Jul 24 13:07:37 2017 by
Generated on Mon Jul 24 17:04:18 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>

File diff suppressed because it is too large Load Diff

View File

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
</div>
<div id="footer">
Generated on Mon Jul 24 13:07:38 2017 by
Generated on Mon Jul 24 17:04:19 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 Mon Jul 24 13:07:38 2017 by
Generated on Mon Jul 24 17:04:19 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,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
111
112
113
114</pre>
114
115
116
117
118
119</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 23</span>
@@ -242,6 +247,20 @@ class cd_nagios::server::files (
# manage nagios.cfg
file { $ng_nagios_cfg_file:
ensure =&gt; file,
path =&gt; $ng_nagios_cfg_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; nagios_etc_t,
seluser =&gt; system_u,
content =&gt; template($ng_nagios_cfg_erb),
notify =&gt; Service[$ng_service],
}
# manage cgi.cfg
file { $ng_cgi_cfg_file:
@@ -258,20 +277,11 @@ class cd_nagios::server::files (
notify =&gt; Service[$ng_service],
}
# manage nagios.conf for httpd
# since we use vhost files, we do not want the regular file to appear
# after upgrades to avoid conflicts
file { $ng_nagios_conf:
ensure =&gt; absent,
# path =&gt; $ng_nagios_conf,
# owner =&gt; &#39;root&#39;,
# group =&gt; &#39;root&#39;,
# mode =&gt; &#39;0644&#39;,
# selrange =&gt; s0,
# selrole =&gt; object_r,
# seltype =&gt; httpd_config_t,
# seluser =&gt; system_u,
# content =&gt; template($ng_nagios_conf_erb),
# notify =&gt; Service[$ae_service],
}
file { $ng_forward_conf:
@@ -324,7 +334,7 @@ class cd_nagios::server::files (
</div>
<div id="footer">
Generated on Mon Jul 24 13:07:38 2017 by
Generated on Mon Jul 24 17:04:19 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

@@ -145,7 +145,53 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
36
37
38
39</pre>
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 23</span>
@@ -165,6 +211,52 @@ class cd_nagios::server::service (
hasrestart =&gt; true,
enable =&gt; true,
}
@@nagios_service { &quot;check_nagios${::hostname}&quot;:
check_command =&gt; &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $::fqdn,
notification_period =&gt; &#39;24x7&#39;,
target =&gt; $ng_target_service,
owner =&gt; &#39;nagios&#39;,
group =&gt; &#39;nagios&#39;,
mode =&gt; &#39;660&#39;,
contacts =&gt; &#39;DevOps&#39;,
}
resources { [ &#39;nagios_host&#39;,
&#39;nagios_hostgroup&#39;,
&#39;nagios_hostdependency&#39;,
&#39;nagios_hostescalation&#39;,
&#39;nagios_hostextinfo&#39;,
&#39;nagios_service&#39;,
&#39;nagios_servicegroup&#39;,
&#39;nagios_servicedependency&#39;,
&#39;nagios_serviceescalation&#39;,
&#39;nagios_serviceextinfo&#39;,
&#39;nagios_contact&#39;,
&#39;nagios_contactgroup&#39;,
&#39;nagios_command&#39;,
&#39;nagios_timeperiod&#39; ]:
purge =&gt; true,
}
# collect resources and populate /etc/nagios/conf.d/nagios_*.cfg
Nagios_host &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_hostgroup &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_hostdependency &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_hostescalation &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_hostextinfo &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_service &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_servicegroup &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_servicedependency &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_serviceescalation &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_serviceextinfo &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_contact &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_contactgroup &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_command &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_timeperiod &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
}
}</pre>
</td>
@@ -174,7 +266,7 @@ class cd_nagios::server::service (
</div>
<div id="footer">
Generated on Mon Jul 24 13:07:38 2017 by
Generated on Mon Jul 24 17:04:19 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>