Merge branch 'jenkins' into 'master'

Jenkins

See merge request !74
This commit is contained in:
12ww1160
2017-07-27 17:14:05 +02:00
40 changed files with 51 additions and 41 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/7f92261f0997dfe">7f92261f0997dfe</a> Jenkins Server <i>2017-07-27 15:20:36</i>
<p>
<h3>recommit for updates in build 127</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/6f0c3a6903ae69a">6f0c3a6903ae69a</a> Arne Teuke <i>2017-07-27 15:19:59</i>
<p>
<h3>removed special params</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/8a1d9f8292afcbe">8a1d9f8292afcbe</a> Jenkins Server <i>2017-07-27 15:01:48</i>
<p>
<h3>recommit for updates in build 126</h3>

View File

@@ -281,7 +281,7 @@
</div>
<div id="footer">
Generated on Thu Jul 27 17:20:23 2017 by
Generated on Thu Jul 27 17:23:03 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:20:25 2017 by
Generated on Thu Jul 27 17:23:05 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:20:24 2017 by
Generated on Thu Jul 27 17:23:04 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:20:25 2017 by
Generated on Thu Jul 27 17:23:05 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:20:30 2017 by
Generated on Thu Jul 27 17:23:09 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:20:30 2017 by
Generated on Thu Jul 27 17:23:09 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:20:30 2017 by
Generated on Thu Jul 27 17:23:09 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:20:29 2017 by
Generated on Thu Jul 27 17:23:09 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:20:29 2017 by
Generated on Thu Jul 27 17:23:08 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:20:29 2017 by
Generated on Thu Jul 27 17:23:09 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:20:29 2017 by
Generated on Thu Jul 27 17:23:08 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:20:31 2017 by
Generated on Thu Jul 27 17:23:10 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:20:31 2017 by
Generated on Thu Jul 27 17:23:11 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:20:31 2017 by
Generated on Thu Jul 27 17:23:10 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:20:31 2017 by
Generated on Thu Jul 27 17:23:11 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

@@ -246,7 +246,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
</div>
<div id="footer">
Generated on Thu Jul 27 17:20:31 2017 by
Generated on Thu Jul 27 17:23:10 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:20:30 2017 by
Generated on Thu Jul 27 17:23:09 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

@@ -171,7 +171,7 @@ class cd_nagios::nagios::objects::config (
require cd_nagios::nagios::objects::servicegroups
require cd_nagios::nagios::objects::add_servicegroup_rules
require cd_nagios::nagios::objects::timeperiods
# require cd_nagios::nagios::objects::add_timeperiod_rules
require cd_nagios::nagios::objects::add_timeperiod_rules
}
}</pre>
@@ -182,7 +182,7 @@ class cd_nagios::nagios::objects::config (
</div>
<div id="footer">
Generated on Thu Jul 27 17:20:30 2017 by
Generated on Thu Jul 27 17:23:09 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:20:31 2017 by
Generated on Thu Jul 27 17:23:10 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:20:30 2017 by
Generated on Thu Jul 27 17:23:10 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:20:30 2017 by
Generated on Thu Jul 27 17:23:10 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:20:31 2017 by
Generated on Thu Jul 27 17:23:10 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:20:31 2017 by
Generated on Thu Jul 27 17:23:10 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:20:31 2017 by
Generated on Thu Jul 27 17:23:10 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

@@ -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:20:29 2017 by
Generated on Thu Jul 27 17:23:08 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:20:30 2017 by
Generated on Thu Jul 27 17:23:09 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:20:30 2017 by
Generated on Thu Jul 27 17:23:09 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:20:29 2017 by
Generated on Thu Jul 27 17:23:09 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:20:30 2017 by
Generated on Thu Jul 27 17:23:09 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:20:32 2017 by
Generated on Thu Jul 27 17:23:11 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:20:33 2017 by
Generated on Thu Jul 27 17:23:12 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:20:32 2017 by
Generated on Thu Jul 27 17:23:12 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:20:33 2017 by
Generated on Thu Jul 27 17:23:12 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

@@ -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:20:32 2017 by
Generated on Thu Jul 27 17:23:12 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:20:32 2017 by
Generated on Thu Jul 27 17:23:11 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:20:32 2017 by
Generated on Thu Jul 27 17:23:11 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:20:25 2017 by
Generated on Thu Jul 27 17:23:05 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

@@ -37,7 +37,7 @@ class cd_nagios::nagios::objects::config (
require cd_nagios::nagios::objects::servicegroups
require cd_nagios::nagios::objects::add_servicegroup_rules
require cd_nagios::nagios::objects::timeperiods
# require cd_nagios::nagios::objects::add_timeperiod_rules
require cd_nagios::nagios::objects::add_timeperiod_rules
}
}

View File

@@ -1,7 +1,7 @@
define timeperiod {
timeperiod_name <%= @ng_timeperiod_name %>
alias <%= @ng_timeperiod_alias %>
timeperiod_name <%= @ng_timep_name %>
alias <%= @ng_timep_alias %>
monday <%= @ng_timep_monday %>
tuesday <%= @ng_timep_tuesday %>
wednesday <%= @ng_timep_wednesday %>