Merge branch 'jenkins' into 'master'

Jenkins See merge request !56
2017-07-26 15:00:04 +02:00
parent 1cc679595d af34a0587d
commit 428abe511c
29 changed files with 53 additions and 40 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/4dd15fea2853777">4dd15fea2853777</a> Jenkins Server <i>2017-07-26 12:48:06</i>
+<p>
+<h3>recommit for updates in build 103</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/6ee49a5e33f28cb">6ee49a5e33f28cb</a> Arne Teuke <i>2017-07-26 12:47:45</i>
+<p>
+<h3>fixed typo</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/19d33cb8a512c2f">19d33cb8a512c2f</a> Jenkins Server <i>2017-07-26 12:40:46</i>
 <p>
 <h3>recommit for updates in build 102</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -221,7 +221,7 @@
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:47:55 2017 by
+  Generated on Wed Jul 26 15:04: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>
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -352,7 +352,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Wed Jul 26 14:47:57 2017 by
+  Generated on Wed Jul 26 15:04:54 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>
--- a/doc/index.html
+++ b/doc/index.html
@@ -352,7 +352,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Wed Jul 26 14:47:56 2017 by
+  Generated on Wed Jul 26 15:04:53 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>
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:47:57 2017 by
+  Generated on Wed Jul 26 15:04:54 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:01 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:01 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:01 2017 by
+  Generated on Wed Jul 26 15:04:57 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:01 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:01 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
@@ -210,7 +210,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
@@ -166,7 +166,7 @@ class cd_nagios::nagios::objects::config (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
@@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -217,7 +217,8 @@ ng_template_object_name =&gt;  &#39;generic-contact&#39;,
 98
 99
 100
-101</pre>
+101
+102</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/template_rules.pp', line 28</span>
@@ -293,6 +294,7 @@ class cd_nagios::nagios::objects::template_rules (
      ng_template_object      =&gt;  &#39;service&#39;,
      ng_template_object_name =&gt;  &#39;local-service&#39;,
      ng_max_check_attempts   =&gt;  &#39;4&#39;,
+      ng_template_object_use  =&gt;  &#39;generic-service&#39;,
    }
  }
 }</pre>
@@ -303,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -5569,7 +5569,7 @@ $ng_target_command        = &quot;${ng_conf_d_dir}/nagios_command.cfg&quot;
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:01 2017 by
+  Generated on Wed Jul 26 15:04:57 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:01 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -268,7 +268,7 @@ class cd_nagios::server::service (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:02 2017 by
+  Generated on Wed Jul 26 15:04:58 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>
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
@@ -247,7 +247,7 @@ $ng_contacts_rule_erb   = $::cd_nagios::params::ng_contacts_rule_erb
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:03 2017 by
+  Generated on Wed Jul 26 15:05:00 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>
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
@@ -767,13 +767,13 @@ Valid options are <code>0</code> and
  
    <li>
      
-        <span class='name'>ng_normal_check_interval</span>
+        <span class='name'>ng_check_interval</span>
      
      
        <span class='type'>(<tt>string</tt>)</span>
      
      
-        <em class="default">(defaults to: <tt>&#39;10&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;5&#39;</tt>)</em>
      
      
        &mdash;
@@ -786,13 +786,13 @@ under normal conditions.</p>
  
    <li>
      
-        <span class='name'>ng_retry_check_interval</span>
+        <span class='name'>ng_retry_interval</span>
      
      
        <span class='type'>(<tt>string</tt>)</span>
      
      
-        <em class="default">(defaults to: <tt>&#39;2&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
      
      
        &mdash;
@@ -911,8 +911,8 @@ $ng_parallelize_check             = &#39;1&#39;,
 $ng_obsess_over_service           = &#39;1&#39;,
 $ng_check_freshness               = &#39;0&#39;,
 $ng_is_volatile                   = &#39;0&#39;,
-$ng_normal_check_interval         = &#39;10&#39;,
-$ng_retry_check_interval          = &#39;2&#39;,
+$ng_check_interval                = &#39;10&#39;,
+$ng_retry_interval                = &#39;2&#39;,


 ) {
@@ -935,7 +935,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:03 2017 by
+  Generated on Wed Jul 26 15:04:59 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>
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:48:03 2017 by
+  Generated on Wed Jul 26 15:04:59 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>
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:47:57 2017 by
+  Generated on Wed Jul 26 15:04:54 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>
--- a/manifests/nagios/objects/template_rules.pp
+++ b/manifests/nagios/objects/template_rules.pp
@@ -96,6 +96,7 @@ class cd_nagios::nagios::objects::template_rules (
      ng_template_object      =>  'service',
      ng_template_object_name =>  'local-service',
      ng_max_check_attempts   =>  '4',
+      ng_template_object_use  =>  'generic-service',
    }
  }
 }
--- a/manifests/nagios/objects/templates.pp
+++ b/manifests/nagios/objects/templates.pp
@@ -94,9 +94,9 @@
 #   Valid options are `0` and `1`.
 # @param  [string] ng_is_volatile Whether the service is volatile.
 #   Valid options are `0` and `1`.
-# @param  [string] ng_normal_check_interval How often to check the service
+# @param  [string] ng_check_interval How often to check the service
 #   under normal conditions.
-# @param  [string]  ng_retry_check_interval Re-check the service every x minutes
+# @param  [string]  ng_retry_interval Re-check the service every x minutes
 #   until a hard state can be determined.
 ################################################################################
 define cd_nagios::nagios::objects::templates (
@@ -131,8 +131,8 @@ $ng_parallelize_check             = '1',
 $ng_obsess_over_service           = '1',
 $ng_check_freshness               = '0',
 $ng_is_volatile                   = '0',
-$ng_normal_check_interval         = '10',
-$ng_retry_check_interval          = '2',
+$ng_check_interval                = '10',
+$ng_retry_interval                = '2',


 ) {
--- a/templates/nagios/templates_cfg_rule.erb
+++ b/templates/nagios/templates_cfg_rule.erb
@@ -110,8 +110,8 @@ define <%= @ng_template_object %>{
  is_volatile                   <%= @ng_is_volatile %>
  check_period                  <%= @ng_check_period %>
  max_check_attempts            <%= @ng_max_check_attempts %>
-  normal_check_interval         <%= @ng_normal_check_interval %>
-  retry_check_interval          <%= @ng_retry_check_interval %>
+  check_interval                <%= @ng_check_interval %>
+  retry_interval                <%= @ng_retry_interval %>
  contact_groups                <%= @ng_contact_groups %>
  notification_interval         <%= @ng_notification_interval %>
  notification_period           <%= @ng_notification_period %>
@@ -123,8 +123,8 @@ define <%= @ng_template_object %>{
  name                          <%= @ng_template_object_name %>
  use                           <%= @ng_template_object_use %>
  max_check_attempts            <%= @ng_max_check_attempts %>
-  normal_check_interval         <%= @ng_normal_check_interval %>
-  retry_check_interval          <%= @ng_retry_check_interval %>
+  check_interval                <%= @ng_check_interval %>
+  retry_interval                <%= @ng_retry_interval %>
  register                      <%= @ng_object_register %>
  }
 <% end -%>