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

Merge branch 'jenkins' into 'master'

Browse Source 
Jenkins

See merge request !65
This commit is contained in:
12ww1160
2017-07-27 14:37:16 +02:00
parent 42febc50b8 dd4d061fe5
commit 964640d2d7
37 changed files with 90 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2> <h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5193e6a8d2dedc5">5193e6a8d2dedc5</a> Jenkins Server <i>2017-07-27 12:33:19</i>
<p>
<h3>recommit for updates in build 114</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/26e2220ec9da0b2">26e2220ec9da0b2</a> Arne Teuke <i>2017-07-27 12:32:48</i>
<p>
<h3>added service description and add_hostgroup_rules</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/f4321e6da976742">f4321e6da976742</a> Jenkins Server <i>2017-07-27 11:58:59</i> <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/f4321e6da976742">f4321e6da976742</a> Jenkins Server <i>2017-07-27 11:58:59</i>
<p> <p>
<h3>recommit for updates in build 113</h3> <h3>recommit for updates in build 113</h3>

7
README.md
View File

@@ -1,6 +1,6 @@
|Repo Name| version | Build Status| |Repo Name| version | Build Status|
|---|---|---|---| |---|---|---|---|
|`cd_nagios`| 0.0.0.8 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| |`cd_nagios`| 0.0.0.9 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)|
### Synopsis ### Synopsis
Nagios is a powerful open source software solution for monitoring your IT environments. Nagios is a powerful open source software solution for monitoring your IT environments.
@@ -62,6 +62,11 @@ Service
* manage Nagios service on server * manage Nagios service on server
* manage NRPE service on clients (optional) * manage NRPE service on clients (optional)
Monitoring
* monitor Nagios host
* monitor Nagios service
### Repo Structure ### Repo Structure
Repostructure has moved to REPOSTRUCTURE.md in repo. Repostructure has moved to REPOSTRUCTURE.md in repo.

4
REPOSTRUCTURE.md
View File

@@ -19,6 +19,7 @@
| | |-- cd_nagios_3A_3Amain_3A_3Auser.html | | |-- cd_nagios_3A_3Amain_3A_3Auser.html
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html
@@ -34,6 +35,7 @@
| |-- puppet_defined_types | |-- puppet_defined_types
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
| | `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html | | `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html
| |-- file.README.html | |-- file.README.html
@@ -114,4 +116,4 @@
|-- README.md |-- README.md
`-- REPOSTRUCTURE.md `-- REPOSTRUCTURE.md
20 directories, 94 files 20 directories, 96 files

7
doc/_index.html
View File

@@ -173,11 +173,6 @@
</li> </li>
<li>
<span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_nagios::server::service (puppet_class)">cd_nagios::server::service</a></span>
</li>
</ul> </ul>
</ul> </ul>
@@ -251,7 +246,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:07 2017 by Generated on Thu Jul 27 14:47:11 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>

8
doc/file.README.html
View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build <p>|Repo Name| version | Build
Status| Status|
|---|---|---|---| |---|---|---|---|
|<code>cd_nagios</code>| 0.0.0.8 | <a |<code>cd_nagios</code>| 0.0.0.9 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
Status</a>/]|</p> Status</a>/]|</p>
@@ -176,6 +176,10 @@ certbot (optional)</p>
* manage NRPE service on clients * manage NRPE service on clients
(optional)</p> (optional)</p>
<p>Monitoring
* monitor Nagios host
* monitor Nagios service</p>
<h3 id="label-Repo+Structure">Repo Structure</h3> <h3 id="label-Repo+Structure">Repo Structure</h3>
<p>Repostructure has moved to REPOSTRUCTURE.md in repo.</p> <p>Repostructure has moved to REPOSTRUCTURE.md in repo.</p>
@@ -365,7 +369,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:08 2017 by Generated on Thu Jul 27 14:47:13 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>

8
doc/index.html
View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build <p>|Repo Name| version | Build
Status| Status|
|---|---|---|---| |---|---|---|---|
|<code>cd_nagios</code>| 0.0.0.8 | <a |<code>cd_nagios</code>| 0.0.0.9 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
Status</a>/]|</p> Status</a>/]|</p>
@@ -176,6 +176,10 @@ certbot (optional)</p>
* manage NRPE service on clients * manage NRPE service on clients
(optional)</p> (optional)</p>
<p>Monitoring
* monitor Nagios host
* monitor Nagios service</p>
<h3 id="label-Repo+Structure">Repo Structure</h3> <h3 id="label-Repo+Structure">Repo Structure</h3>
<p>Repostructure has moved to REPOSTRUCTURE.md in repo.</p> <p>Repostructure has moved to REPOSTRUCTURE.md in repo.</p>
@@ -365,7 +369,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:07 2017 by Generated on Thu Jul 27 14:47:12 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>

7
doc/puppet_class_list.html
View File

@@ -187,13 +187,6 @@
</li> </li>
<li id="object_puppet_classes::cd_nagios::server::service" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_nagios::server::service (puppet_class)">cd_nagios::server::service</a></span>
</div>
</li>
</ul> </ul>
</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 Thu Jul 27 14:33:08 2017 by Generated on Thu Jul 27 14:47:13 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 Thu Jul 27 14:33:13 2017 by Generated on Thu Jul 27 14:47:18 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 Thu Jul 27 14:33:13 2017 by Generated on Thu Jul 27 14:47:19 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 Thu Jul 27 14:33:13 2017 by Generated on Thu Jul 27 14:47:19 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 Thu Jul 27 14:33:12 2017 by Generated on Thu Jul 27 14:47:18 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 Thu Jul 27 14:33:12 2017 by Generated on Thu Jul 27 14:47:18 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 Thu Jul 27 14:33:12 2017 by Generated on Thu Jul 27 14:47:18 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 Thu Jul 27 14:33:12 2017 by Generated on Thu Jul 27 14:47:18 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_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
View File

@@ -210,7 +210,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:14 2017 by Generated on Thu Jul 27 14:47:20 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_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html
View File

@@ -227,7 +227,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:14 2017 by Generated on Thu Jul 27 14:47:20 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_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html
View File

@@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:14 2017 by Generated on Thu Jul 27 14:47:20 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_3Anagios_3A_3Aobjects_3A_3Acommands.html
View File

@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:13 2017 by Generated on Thu Jul 27 14:47:19 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_3Anagios_3A_3Aobjects_3A_3Aconfig.html
View File

@@ -174,7 +174,7 @@ class cd_nagios::nagios::objects::config (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:13 2017 by Generated on Thu Jul 27 14:47:19 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_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html
View File

@@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:14 2017 by Generated on Thu Jul 27 14:47:19 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_3Anagios_3A_3Aobjects_3A_3Acontacts.html
View File

@@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:13 2017 by Generated on Thu Jul 27 14:47:19 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_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html
View File

@@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:13 2017 by Generated on Thu Jul 27 14:47:19 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_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
View File

@@ -305,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:14 2017 by Generated on Thu Jul 27 14:47:20 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>

8
doc/puppet_classes/cd_nagios_3A_3Aparams.html
View File

@@ -83,8 +83,6 @@
<span class='object_link'><a href="cd_nagios_3A_3Aselinux_3A_3Aconfig.html" title="puppet_classes::cd_nagios::selinux::config (puppet_class)">cd_nagios::selinux::config</a></span><br/> <span class='object_link'><a href="cd_nagios_3A_3Aselinux_3A_3Aconfig.html" title="puppet_classes::cd_nagios::selinux::config (puppet_class)">cd_nagios::selinux::config</a></span><br/>
<span class='object_link'><a href="cd_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_nagios::server::service (puppet_class)">cd_nagios::server::service</a></span><br/>
<span class='object_link'><a href="cd_nagios_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::cd_nagios::firewall::iptables (puppet_class)">cd_nagios::firewall::iptables</a></span><br/> <span class='object_link'><a href="cd_nagios_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::cd_nagios::firewall::iptables (puppet_class)">cd_nagios::firewall::iptables</a></span><br/>
<span class='object_link'><a href="cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::cd_nagios::server::access_rules (puppet_class)">cd_nagios::server::access_rules</a></span><br/> <span class='object_link'><a href="cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::cd_nagios::server::access_rules (puppet_class)">cd_nagios::server::access_rules</a></span><br/>
@@ -5229,7 +5227,8 @@ up</p>
988 988
989 989
990 990
991</pre> 991
992</pre>
</td> </td>
<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 646</span>
@@ -5559,6 +5558,7 @@ $ng_target_host = &quot;${ng_conf_d_dir}/nagios_host.cfg&quot;
$ng_target_hostgroup_base = &quot;${ng_conf_d_dir}/nagios_hostgroups_base.cfg&quot; $ng_target_hostgroup_base = &quot;${ng_conf_d_dir}/nagios_hostgroups_base.cfg&quot;
$ng_tgt_hostgroup_add = &quot;${ng_conf_d_dir}/nagios_hostgroups_add.cfg&quot; $ng_tgt_hostgroup_add = &quot;${ng_conf_d_dir}/nagios_hostgroups_add.cfg&quot;
$ng_tgt_hostgrp_head_erb = &#39;cd_nagios/nagios/hostgroups_cfg_head.erb&#39; $ng_tgt_hostgrp_head_erb = &#39;cd_nagios/nagios/hostgroups_cfg_head.erb&#39;
$ng_tgt_hostgrp_rule_erb = &#39;cd_nagios/nagios/hostgroups_cfg_rule.erb&#39;
$ng_target_hostdep = &quot;${ng_conf_d_dir}/nagios_hostdependency.cfg&quot; $ng_target_hostdep = &quot;${ng_conf_d_dir}/nagios_hostdependency.cfg&quot;
$ng_target_hostesc = &quot;${ng_conf_d_dir}/nagios_hostescalation.cfg&quot; $ng_target_hostesc = &quot;${ng_conf_d_dir}/nagios_hostescalation.cfg&quot;
$ng_target_hostext = &quot;${ng_conf_d_dir}/nagios_hostextinfo.cfg&quot; $ng_target_hostext = &quot;${ng_conf_d_dir}/nagios_hostextinfo.cfg&quot;
@@ -5587,7 +5587,7 @@ $ng_target_command = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:12 2017 by Generated on Thu Jul 27 14:47:18 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 Thu Jul 27 14:33:13 2017 by Generated on Thu Jul 27 14:47:19 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 Thu Jul 27 14:33:13 2017 by Generated on Thu Jul 27 14:47:19 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 Thu Jul 27 14:33:12 2017 by Generated on Thu Jul 27 14:47:18 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_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
View File

@@ -260,7 +260,7 @@ $ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:15 2017 by Generated on Thu Jul 27 14:47:21 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_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
View File

@@ -237,7 +237,7 @@ $ng_cntctgrps_rule_erb = $::cd_nagios::params::ng_cntctgrps_rule_erb
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:15 2017 by Generated on Thu Jul 27 14:47:21 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>

6
doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
View File

@@ -212,14 +212,14 @@ $ng_hostgroup_register = &#39;1&#39;,
$ng_nagios_server = $::cd_nagios::params::ng_nagios_server $ng_nagios_server = $::cd_nagios::params::ng_nagios_server
$ng_tgt_hostgroup_add = $::cd_nagios::params::ng_tgt_hostgroup_add $ng_tgt_hostgroup_add = $::cd_nagios::params::ng_tgt_hostgroup_add
$ng_tgt_hostgrp_head_erb = $::cd_nagios::params::ng_tgt_hostgrp_head_erb $ng_tgt_hostgrp_rule_erb = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
if $::fqdn == $ng_nagios_server { if $::fqdn == $ng_nagios_server {
concat::fragment { $name: concat::fragment { $name:
target =&gt; $ng_tgt_hostgroup_add, target =&gt; $ng_tgt_hostgroup_add,
content =&gt; template($ng_tgt_hostgrp_head_erb), content =&gt; template($ng_tgt_hostgrp_rule_erb),
} }
} }
}</pre> }</pre>
@@ -230,7 +230,7 @@ $ng_tgt_hostgrp_head_erb = $::cd_nagios::params::ng_tgt_hostgrp_head_erb
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:15 2017 by Generated on Thu Jul 27 14:47:21 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_3Anagios_3A_3Aobjects_3A_3Atemplates.html
View File

@@ -935,7 +935,7 @@ $ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 14:33:15 2017 by Generated on Thu Jul 27 14:47:21 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 Thu Jul 27 14:33:14 2017 by Generated on Thu Jul 27 14:47:20 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 Thu Jul 27 14:33:08 2017 by Generated on Thu Jul 27 14:47:13 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>

4
manifests/nagios/objects/add_hostgroups.pp
View File

@@ -36,14 +36,14 @@ $ng_hostgroup_register = '1',
$ng_nagios_server = $::cd_nagios::params::ng_nagios_server $ng_nagios_server = $::cd_nagios::params::ng_nagios_server
$ng_tgt_hostgroup_add = $::cd_nagios::params::ng_tgt_hostgroup_add $ng_tgt_hostgroup_add = $::cd_nagios::params::ng_tgt_hostgroup_add
$ng_tgt_hostgrp_head_erb = $::cd_nagios::params::ng_tgt_hostgrp_head_erb $ng_tgt_hostgrp_rule_erb = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
if $::fqdn == $ng_nagios_server { if $::fqdn == $ng_nagios_server {
concat::fragment { $name: concat::fragment { $name:
target => $ng_tgt_hostgroup_add, target => $ng_tgt_hostgroup_add,
content => template($ng_tgt_hostgrp_head_erb), content => template($ng_tgt_hostgrp_rule_erb),
} }
} }
} }

1
manifests/params.pp
View File

@@ -968,6 +968,7 @@ $ng_target_host = "${ng_conf_d_dir}/nagios_host.cfg"
$ng_target_hostgroup_base = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg" $ng_target_hostgroup_base = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg"
$ng_tgt_hostgroup_add = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg" $ng_tgt_hostgroup_add = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg"
$ng_tgt_hostgrp_head_erb = 'cd_nagios/nagios/hostgroups_cfg_head.erb' $ng_tgt_hostgrp_head_erb = 'cd_nagios/nagios/hostgroups_cfg_head.erb'
$ng_tgt_hostgrp_rule_erb = 'cd_nagios/nagios/hostgroups_cfg_rule.erb'
$ng_target_hostdep = "${ng_conf_d_dir}/nagios_hostdependency.cfg" $ng_target_hostdep = "${ng_conf_d_dir}/nagios_hostdependency.cfg"
$ng_target_hostesc = "${ng_conf_d_dir}/nagios_hostescalation.cfg" $ng_target_hostesc = "${ng_conf_d_dir}/nagios_hostescalation.cfg"
$ng_target_hostext = "${ng_conf_d_dir}/nagios_hostextinfo.cfg" $ng_target_hostext = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"

29
manifests/server/service.pp
View File

@@ -37,16 +37,33 @@ class cd_nagios::server::service (
enable => true, enable => true,
} }
@@nagios_service { "check_nagios_${::hostname}": @@nagios_host { 'localhost':
ensure => $ng_ping_ensure,
alias => 'localhost',
address => '127.0.0.1',
use => 'linux-server',
target => $ng_target_localhost,
hostgroups => 'linux-servers',
contacts => 'ops',
max_check_attempts => $max_check_attempts,
notification_period => '24x7',
owner => $ng_user,
group => $ng_user,
mode => '0640',
check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}",
notify => Service ['nagios'],
}
@@nagios_service { "check_nagios_localhost":
check_command => 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios', check_command => 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios',
use => 'generic-service', use => 'generic-service',
host_name => $::fqdn, host_name => 'localhost',
notification_period => '24x7', notification_period => '24x7',
service_description => "${::hostname}_nagios_service", service_description => 'localhost_nagios_service',
target => $ng_target_service, target => $ng_target_service,
owner => 'nagios', owner => $ng_user,
group => 'nagios', group => $ng_user,
mode => '0660', mode => '0640',
contacts => 'ops', contacts => 'ops',
} }