Merge branch 'jenkins' into 'master'

Jenkins

See merge request !76
This commit is contained in:
12ww1160
2017-07-28 12:39:52 +02:00
41 changed files with 57 additions and 47 deletions

View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d6da17fd103efa5">d6da17fd103efa5</a> Jenkins Server <i>2017-07-27 15:30:56</i>
<p>
<h3>recommit for updates in build 129</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/98c65c3b14a0d09">98c65c3b14a0d09</a> Arne Teuke <i>2017-07-27 15:30:20</i>
<p>
<h3>fixed typo</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a51c3d01180ce89">a51c3d01180ce89</a> Jenkins Server <i>2017-07-27 15:23:15</i>
<p>
<h3>recommit for updates in build 128</h3>

View File

@@ -281,7 +281,7 @@
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:44 2017 by
Generated on Thu Jul 27 17:34:43 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

@@ -376,7 +376,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Thu Jul 27 17:30:46 2017 by
Generated on Thu Jul 27 17:34: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

@@ -376,7 +376,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Thu Jul 27 17:30:45 2017 by
Generated on Thu Jul 27 17:34: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

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

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:50 2017 by
Generated on Thu Jul 27 17:34:49 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 Thu Jul 27 17:30:50 2017 by
Generated on Thu Jul 27 17:34:49 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 Thu Jul 27 17:30:51 2017 by
Generated on Thu Jul 27 17:34: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::main::config (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:50 2017 by
Generated on Thu Jul 27 17:34:49 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 Thu Jul 27 17:30:50 2017 by
Generated on Thu Jul 27 17:34:49 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 Thu Jul 27 17:30:50 2017 by
Generated on Thu Jul 27 17:34:49 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 Thu Jul 27 17:30:50 2017 by
Generated on Thu Jul 27 17:34:49 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

@@ -210,7 +210,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:52 2017 by
Generated on Thu Jul 27 17:34: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

@@ -215,7 +215,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:52 2017 by
Generated on Thu Jul 27 17:34: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

@@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:52 2017 by
Generated on Thu Jul 27 17:34: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

@@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_servicegroup_rules (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:52 2017 by
Generated on Thu Jul 27 17:34: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

@@ -204,9 +204,9 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
# manage /etc/nagios/conf.d/nagios_timeperiods_add.cfg
concat { $ng_tgt_timeperiods_add:
concat { $ng_tgt_timep_add:
ensure =&gt; present,
path =&gt; $ng_tgt_timeperiods_add,
path =&gt; $ng_tgt_timep_add,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
@@ -220,7 +220,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
# manage file header
concat::fragment { &#39;timeperiods_header&#39;:
target =&gt; $ng_tgt_timeperiods_add,
target =&gt; $ng_tgt_timep_add,
content =&gt; template($ng_tgt_timep_head_erb),
order =&gt; &#39;000&#39;,
}
@@ -246,7 +246,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:52 2017 by
Generated on Thu Jul 27 17:34: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

@@ -597,7 +597,7 @@ class cd_nagios::nagios::objects::commands (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:51 2017 by
Generated on Thu Jul 27 17:34: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

@@ -182,7 +182,7 @@ class cd_nagios::nagios::objects::config (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:51 2017 by
Generated on Thu Jul 27 17:34: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

@@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:51 2017 by
Generated on Thu Jul 27 17:34: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

@@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:51 2017 by
Generated on Thu Jul 27 17:34: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

@@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:51 2017 by
Generated on Thu Jul 27 17:34: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

@@ -235,7 +235,7 @@ class cd_nagios::nagios::objects::servicegroups (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:51 2017 by
Generated on Thu Jul 27 17:34: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

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

@@ -5571,7 +5571,7 @@ $ng_target_templates = &quot;${ng_conf_d_dir}/nagios_templates.cfg&quot;
$ng_templates_head_erb = &#39;cd_nagios/nagios/templates_cfg_head.erb&#39;
$ng_templates_rule_erb = &#39;cd_nagios/nagios/templates_cfg_rule.erb&#39;
$ng_tgt_timeperiods_base = &quot;${ng_conf_d_dir}/nagios_timeperiods.cfg&quot;
$ng_tgt_timeperiods_add = &quot;${ng_conf_d_dir}/nagios_timeperiods_add.cfg&quot;
$ng_tgt_timep_add = &quot;${ng_conf_d_dir}/nagios_timeperiods_add.cfg&quot;
$ng_tgt_timep_head_erb = &#39;cd_nagios/nagios/timeperiods_cfg_head.erb&#39;
$ng_tgt_timep_rule_erb = &#39;cd_nagios/nagios/timeperiods_cfg_rule.erb&#39;
$ng_target_localhost = &quot;${ng_conf_d_dir}/nagios_localhost.cfg&quot;
@@ -5611,7 +5611,7 @@ $ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/us
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:50 2017 by
Generated on Thu Jul 27 17:34:49 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 Thu Jul 27 17:30:50 2017 by
Generated on Thu Jul 27 17:34: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 Thu Jul 27 17:30:51 2017 by
Generated on Thu Jul 27 17:34: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

@@ -334,7 +334,7 @@ class cd_nagios::server::files (
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:50 2017 by
Generated on Thu Jul 27 17:34:49 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 Thu Jul 27 17:30:51 2017 by
Generated on Thu Jul 27 17:34: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 Thu Jul 27 17:30:53 2017 by
Generated on Thu Jul 27 17:34: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

@@ -237,7 +237,7 @@ $ng_cntctgrps_rule_erb = $::cd_nagios::params::ng_cntctgrps_rule_erb
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:53 2017 by
Generated on Thu Jul 27 17:34: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

@@ -245,7 +245,7 @@ $ng_tgt_hostgrp_rule_erb = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:53 2017 by
Generated on Thu Jul 27 17:34: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

@@ -228,7 +228,7 @@ $ng_tgt_svcgrp_rule_erb = $::cd_nagios::params::ng_tgt_svcgrp_rule_erb
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:53 2017 by
Generated on Thu Jul 27 17:34: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

@@ -368,7 +368,7 @@ $ng_timep_sunday = &#39;00:00-00:00&#39;,
) {
$ng_nagios_server = $::cd_nagios::params::ng_nagios_server
$ng_tgt_timeperiods_add = $::cd_nagios::params::ng_tgt_timeperiods_add
$ng_tgt_timep_add = $::cd_nagios::params::ng_tgt_timep_add
$ng_tgt_timep_rule_erb = $::cd_nagios::params::ng_tgt_timep_rule_erb
if $::fqdn == $ng_nagios_server {
@@ -386,7 +386,7 @@ $ng_tgt_timep_rule_erb = $::cd_nagios::params::ng_tgt_timep_rule_erb
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:53 2017 by
Generated on Thu Jul 27 17:34: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

@@ -906,7 +906,7 @@ $ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:53 2017 by
Generated on Thu Jul 27 17:34: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

@@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:52 2017 by
Generated on Thu Jul 27 17:34: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

@@ -90,7 +90,7 @@
</div>
<div id="footer">
Generated on Thu Jul 27 17:30:46 2017 by
Generated on Thu Jul 27 17:34: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

@@ -40,9 +40,9 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
# manage /etc/nagios/conf.d/nagios_timeperiods_add.cfg
concat { $ng_tgt_timeperiods_add:
concat { $ng_tgt_timep_add:
ensure => present,
path => $ng_tgt_timeperiods_add,
path => $ng_tgt_timep_add,
owner => $ng_user,
group => $ng_user,
mode => '0640',
@@ -56,7 +56,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
# manage file header
concat::fragment { 'timeperiods_header':
target => $ng_tgt_timeperiods_add,
target => $ng_tgt_timep_add,
content => template($ng_tgt_timep_head_erb),
order => '000',
}

View File

@@ -58,7 +58,7 @@ $ng_timep_sunday = '00:00-00:00',
) {
$ng_nagios_server = $::cd_nagios::params::ng_nagios_server
$ng_tgt_timeperiods_add = $::cd_nagios::params::ng_tgt_timeperiods_add
$ng_tgt_timep_add = $::cd_nagios::params::ng_tgt_timep_add
$ng_tgt_timep_rule_erb = $::cd_nagios::params::ng_tgt_timep_rule_erb
if $::fqdn == $ng_nagios_server {

View File

@@ -964,7 +964,7 @@ $ng_target_templates = "${ng_conf_d_dir}/nagios_templates.cfg"
$ng_templates_head_erb = 'cd_nagios/nagios/templates_cfg_head.erb'
$ng_templates_rule_erb = 'cd_nagios/nagios/templates_cfg_rule.erb'
$ng_tgt_timeperiods_base = "${ng_conf_d_dir}/nagios_timeperiods.cfg"
$ng_tgt_timeperiods_add = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg"
$ng_tgt_timep_add = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg"
$ng_tgt_timep_head_erb = 'cd_nagios/nagios/timeperiods_cfg_head.erb'
$ng_tgt_timep_rule_erb = 'cd_nagios/nagios/timeperiods_cfg_rule.erb'
$ng_target_localhost = "${ng_conf_d_dir}/nagios_localhost.cfg"