Merge branch 'jenkins' into 'master'

Jenkins See merge request !55
2017-07-26 14:38:52 +02:00
parent fed9391fb2 4dd15fea28
commit 1cc679595d
28 changed files with 38 additions and 55 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/19d33cb8a512c2f">19d33cb8a512c2f</a> Jenkins Server <i>2017-07-26 12:40:46</i>
+<p>
+<h3>recommit for updates in build 102</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/6955770373d63a1">6955770373d63a1</a> Arne Teuke <i>2017-07-26 12:40:23</i>
+<p>
+<h3>fixed typo</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5a33b87c5a01e94">5a33b87c5a01e94</a> Jenkins Server <i>2017-07-26 12:36:37</i>
 <p>
 <h3>recommit for updates in build 101</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -221,7 +221,7 @@
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:40:36 2017 by
+  Generated on Wed Jul 26 14:47:55 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:40:38 2017 by
+  Generated on Wed Jul 26 14:47: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/index.html
+++ b/doc/index.html
@@ -352,7 +352,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Wed Jul 26 14:40:37 2017 by
+  Generated on Wed Jul 26 14:47:56 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:40:38 2017 by
+  Generated on Wed Jul 26 14:47: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_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:40:42 2017 by
+  Generated on Wed Jul 26 14:48:01 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:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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:40:42 2017 by
+  Generated on Wed Jul 26 14:48:01 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:40:42 2017 by
+  Generated on Wed Jul 26 14:48:01 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:40:42 2017 by
+  Generated on Wed Jul 26 14:48:01 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:40:42 2017 by
+  Generated on Wed Jul 26 14:48:01 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
@@ -168,16 +168,7 @@ ng_contact_alias =&gt; &#39;Example User&#39;,
 57
 58
 59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69</pre>
+60</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contact_rules.pp', line 31</span>
@@ -210,15 +201,6 @@ class cd_nagios::nagios::objects::add_contact_rules (
      content   =&gt;  template($ng_contacts_head_erb),
      order     =&gt;  &#39;000&#39;,
    }
-
-    # example rule for testing
-
-    cd_nagios::nagios::objects::add_contact { &#39;example_user&#39;:
-      ng_contact_name   =&gt;  &#39;example_user&#39;,
-      ng_contact_alias  =&gt;  &#39;Example User&#39;,
-      ng_contact_groups =&gt;  &#39;admins&#39;,
-      ng_contact_email  =&gt;  &#39;example@example.net&#39;,
-    }
  }
 }</pre>
      </td>
@@ -228,7 +210,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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
@@ -291,7 +291,7 @@ class cd_nagios::nagios::objects::template_rules (
    }
    cd_nagios::nagios::objects::templates { &#39;local-service&#39;:
      ng_template_object      =&gt;  &#39;service&#39;,
-      ng_template_object_name =&gt;  &#39;generic-service&#39;,
+      ng_template_object_name =&gt;  &#39;local-service&#39;,
      ng_max_check_attempts   =&gt;  &#39;4&#39;,
    }
  }
@@ -303,7 +303,7 @@ class cd_nagios::nagios::objects::template_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 14:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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:40:42 2017 by
+  Generated on Wed Jul 26 14:48:01 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:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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:40:42 2017 by
+  Generated on Wed Jul 26 14:48:01 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:40:43 2017 by
+  Generated on Wed Jul 26 14:48:02 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:40:44 2017 by
+  Generated on Wed Jul 26 14:48: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>
--- 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
@@ -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:40:44 2017 by
+  Generated on Wed Jul 26 14:48: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>
--- 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:40:44 2017 by
+  Generated on Wed Jul 26 14:48: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>
--- 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:40:38 2017 by
+  Generated on Wed Jul 26 14:47: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/manifests/nagios/objects/add_contact_rules.pp
+++ b/manifests/nagios/objects/add_contact_rules.pp
@@ -56,14 +56,5 @@ class cd_nagios::nagios::objects::add_contact_rules (
      content   =>  template($ng_contacts_head_erb),
      order     =>  '000',
    }
-
-    # example rule for testing
-
-    cd_nagios::nagios::objects::add_contact { 'example_user':
-      ng_contact_name   =>  'example_user',
-      ng_contact_alias  =>  'Example User',
-      ng_contact_groups =>  'admins',
-      ng_contact_email  =>  'example@example.net',
-    }
  }
 }
--- a/manifests/nagios/objects/template_rules.pp
+++ b/manifests/nagios/objects/template_rules.pp
@@ -94,7 +94,7 @@ class cd_nagios::nagios::objects::template_rules (
    }
    cd_nagios::nagios::objects::templates { 'local-service':
      ng_template_object      =>  'service',
-      ng_template_object_name =>  'generic-service',
+      ng_template_object_name =>  'local-service',
      ng_max_check_attempts   =>  '4',
    }
  }