Merge branch 'jenkins' into 'master'

Jenkins

See merge request !61
This commit is contained in:
12ww1160
2017-07-27 13:15:44 +02:00
31 changed files with 58 additions and 32 deletions

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/14a1e7412ff6792">14a1e7412ff6792</a> Jenkins Server <i>2017-07-27 11:00:10</i>
<p>
<h3>recommit for updates in build 110</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a90da5d3ed18e7a">a90da5d3ed18e7a</a> Arne Teuke <i>2017-07-27 10:59:39</i>
<p>
<h3>added and linked add_contactgroups_rules</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/699586d7d8b5253">699586d7d8b5253</a> Jenkins Server <i>2017-07-27 10:56:34</i> <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/699586d7d8b5253">699586d7d8b5253</a> Jenkins Server <i>2017-07-27 10:56:34</i>
<p> <p>
<h3>recommit for updates in build 109</h3> <h3>recommit for updates in build 109</h3>

View File

@@ -24,6 +24,8 @@ Nagios is a powerful open source software solution for monitoring your IT enviro
* [PuppetDB] * [PuppetDB]
* [SELINUX](#selinux) * [SELINUX](#selinux)
* [Certbot](#certbot) * [Certbot](#certbot)
* [Httpd vHost Files](#httpd-vhost-files)
* [Manage additional resources]
* [Known Problems](#known-problems) * [Known Problems](#known-problems)
* [Support](#support) * [Support](#support)
* [Tests](#tests) * [Tests](#tests)
@@ -120,6 +122,8 @@ If you prefer to use https but use self-signed certs or your own CA, simply set
### httpd vHost files ### httpd vHost files
by Default, Nagios creates its own nagios.conf file, which is not a vhost file and relies on the main ssd.conf. However, as Nagios might be running on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host. by Default, Nagios creates its own nagios.conf file, which is not a vhost file and relies on the main ssd.conf. However, as Nagios might be running on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host.
### Manage additional resources
### Known Problems ### Known Problems
### Support ### Support

View File

@@ -236,7 +236,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 12:59:58 2017 by Generated on Thu Jul 27 13:11:44 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>

View File

@@ -112,6 +112,10 @@ Structure</a></p>
</li><li> </li><li>
<p><a href="#certbot">Certbot</a></p> <p><a href="#certbot">Certbot</a></p>
</li><li> </li><li>
<p><a href="#httpd-vhost-files">Httpd vHost Files</a></p>
</li><li>
<p>[Manage additional resources]</p>
</li><li>
<p><a href="#known-problems">Known Problems</a></p> <p><a href="#known-problems">Known Problems</a></p>
</li><li> </li><li>
<p><a href="#support">Support</a></p> <p><a href="#support">Support</a></p>
@@ -296,6 +300,8 @@ on a regular web server with various other web instances (not recommended
through for performance reasons), we will not want to manage ssl.conf through for performance reasons), we will not want to manage ssl.conf
directly, hence the module creates a vhost for the ssl host.</p> directly, hence the module creates a vhost for the ssl host.</p>
<h3 id="label-Manage+additional+resources">Manage additional resources</h3>
<h3 id="label-Known+Problems">Known Problems</h3> <h3 id="label-Known+Problems">Known Problems</h3>
<h3 id="label-Support">Support</h3> <h3 id="label-Support">Support</h3>
@@ -355,7 +361,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 12:59:59 2017 by Generated on Thu Jul 27 13:11:46 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>

View File

@@ -112,6 +112,10 @@ Structure</a></p>
</li><li> </li><li>
<p><a href="#certbot">Certbot</a></p> <p><a href="#certbot">Certbot</a></p>
</li><li> </li><li>
<p><a href="#httpd-vhost-files">Httpd vHost Files</a></p>
</li><li>
<p>[Manage additional resources]</p>
</li><li>
<p><a href="#known-problems">Known Problems</a></p> <p><a href="#known-problems">Known Problems</a></p>
</li><li> </li><li>
<p><a href="#support">Support</a></p> <p><a href="#support">Support</a></p>
@@ -296,6 +300,8 @@ on a regular web server with various other web instances (not recommended
through for performance reasons), we will not want to manage ssl.conf through for performance reasons), we will not want to manage ssl.conf
directly, hence the module creates a vhost for the ssl host.</p> directly, hence the module creates a vhost for the ssl host.</p>
<h3 id="label-Manage+additional+resources">Manage additional resources</h3>
<h3 id="label-Known+Problems">Known Problems</h3> <h3 id="label-Known+Problems">Known Problems</h3>
<h3 id="label-Support">Support</h3> <h3 id="label-Support">Support</h3>
@@ -355,7 +361,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 12:59:59 2017 by Generated on Thu Jul 27 13:11:45 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>

View File

@@ -139,7 +139,7 @@ class cd_nagios {
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:00 2017 by Generated on Thu Jul 27 13:11:46 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>

View File

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:04 2017 by Generated on Thu Jul 27 13:11:51 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>

View File

@@ -368,7 +368,7 @@ class cd_nagios::client::target (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:04 2017 by Generated on Thu Jul 27 13:11:51 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>

View File

@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:04 2017 by Generated on Thu Jul 27 13:11:52 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>

View File

@@ -195,7 +195,7 @@ class cd_nagios::main::config (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:04 2017 by Generated on Thu Jul 27 13:11:51 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>

View File

@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:03 2017 by Generated on Thu Jul 27 13:11:50 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>

View File

@@ -235,7 +235,7 @@ class cd_nagios::main::install (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:04 2017 by Generated on Thu Jul 27 13:11:51 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>

View File

@@ -200,7 +200,7 @@ class cd_nagios::main::user (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:04 2017 by Generated on Thu Jul 27 13:11:51 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>

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 13:00:05 2017 by Generated on Thu Jul 27 13:11:52 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>

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 13:00:05 2017 by Generated on Thu Jul 27 13:11:52 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>

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 13:00:05 2017 by Generated on Thu Jul 27 13:11:52 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>

View File

@@ -170,7 +170,7 @@ class cd_nagios::nagios::objects::config (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:05 2017 by Generated on Thu Jul 27 13:11:52 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>

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 13:00:05 2017 by Generated on Thu Jul 27 13:11:52 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>

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 13:00:05 2017 by Generated on Thu Jul 27 13:11:52 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>

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 13:00:05 2017 by Generated on Thu Jul 27 13:11:52 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>

View File

@@ -5579,7 +5579,7 @@ $ng_target_command = &quot;${ng_conf_d_dir}/nagios_command.cfg&quot;
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:03 2017 by Generated on Thu Jul 27 13:11:50 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>

View File

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:04 2017 by Generated on Thu Jul 27 13:11:51 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>

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 13:00:04 2017 by Generated on Thu Jul 27 13:11:52 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>

View File

@@ -334,7 +334,7 @@ class cd_nagios::server::files (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:04 2017 by Generated on Thu Jul 27 13:11:51 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>

View File

@@ -268,7 +268,7 @@ class cd_nagios::server::service (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 13:00:04 2017 by Generated on Thu Jul 27 13:11:51 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>

View File

@@ -247,7 +247,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 13:00:06 2017 by Generated on Thu Jul 27 13:11:53 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>

View File

@@ -201,14 +201,14 @@ $ng_contactgroup_register = &#39;1&#39;,
$ng_nagios_server = $::cd_nagios::params::ng_nagios_server $ng_nagios_server = $::cd_nagios::params::ng_nagios_server
$ng_tgt_contactgroup_add = $::cd_nagios::params::ng_tgt_contactgroup_add $ng_tgt_contactgroup_add = $::cd_nagios::params::ng_tgt_contactgroup_add
$ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb $ng_cntctgrps_rule_erb = $::cd_nagios::params::ng_cntctgrps_rule_erb
if $::fqdn == $ng_nagios_server { if $::fqdn == $ng_nagios_server {
concat::fragment { $name: concat::fragment { $name:
target =&gt; $ng_tgt_contactgroup_add, target =&gt; $ng_tgt_contactgroup_add,
content =&gt; template($ng_contacts_rule_erb), content =&gt; template($ng_cntctgrps_rule_erb),
} }
} }
}</pre> }</pre>
@@ -219,7 +219,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 13:00:06 2017 by Generated on Thu Jul 27 13:11:53 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>

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 13:00:06 2017 by Generated on Thu Jul 27 13:11:53 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>

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 13:00:05 2017 by Generated on Thu Jul 27 13:11:52 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>

View File

@@ -90,7 +90,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Jul 27 12:59:59 2017 by Generated on Thu Jul 27 13:11:46 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>

View File

@@ -31,14 +31,14 @@ $ng_contactgroup_register = '1',
$ng_nagios_server = $::cd_nagios::params::ng_nagios_server $ng_nagios_server = $::cd_nagios::params::ng_nagios_server
$ng_tgt_contactgroup_add = $::cd_nagios::params::ng_tgt_contactgroup_add $ng_tgt_contactgroup_add = $::cd_nagios::params::ng_tgt_contactgroup_add
$ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb $ng_cntctgrps_rule_erb = $::cd_nagios::params::ng_cntctgrps_rule_erb
if $::fqdn == $ng_nagios_server { if $::fqdn == $ng_nagios_server {
concat::fragment { $name: concat::fragment { $name:
target => $ng_tgt_contactgroup_add, target => $ng_tgt_contactgroup_add,
content => template($ng_contacts_rule_erb), content => template($ng_cntctgrps_rule_erb),
} }
} }
} }