Merge branch 'jenkins' into 'master'

Jenkins See merge request !63
2017-07-27 13:52:06 +02:00
parent 0b8935278f f4321e6da9
commit afc4246914
33 changed files with 78 additions and 43 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/cad8229c0821ad4">cad8229c0821ad4</a> Jenkins Server <i>2017-07-27 11:44:51</i>
+<p>
+<h3>recommit for updates in build 112</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/7b27896ccb84382">7b27896ccb84382</a> Arne Teuke <i>2017-07-27 11:44:19</i>
+<p>
+<h3>added and linked hostgroups</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d6267355c6ba26f">d6267355c6ba26f</a> Jenkins Server <i>2017-07-27 11:11:57</i>
 <p>
 <h3>recommit for updates in build 111</h3>
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -23,6 +23,7 @@
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
+|   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
 |   |   |-- cd_nagios_3A_3Aparams.html
 |   |   |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -109,4 +110,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

-20 directories, 89 files
+20 directories, 90 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -241,7 +241,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:39 2017 by
+  Generated on Thu Jul 27 13:58:47 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
@@ -365,7 +365,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:41 2017 by
+  Generated on Thu Jul 27 13:58: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>
--- a/doc/index.html
+++ b/doc/index.html
@@ -365,7 +365,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:40 2017 by
+  Generated on Thu Jul 27 13:58:48 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 Thu Jul 27 13:44:41 2017 by
+  Generated on Thu Jul 27 13:58: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>
--- 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 Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:44 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:44 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:44 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:46 2017 by
+  Generated on Thu Jul 27 13:58: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_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html
@@ -227,7 +227,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:46 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_3Anagios_3A_3Aobjects_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
@@ -172,7 +172,7 @@ class cd_nagios::nagios::objects::config (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html
@@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:46 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html
@@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:46 2017 by
+  Generated on Thu Jul 27 13:58: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_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -305,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:46 2017 by
+  Generated on Thu Jul 27 13:58: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_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -5581,7 +5581,7 @@ $ng_target_command        = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:44 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -214,7 +214,7 @@ class cd_nagios::server::service (
      enable      =&gt; true,
    }

-    @@nagios_service { &quot;check_nagios${::hostname}&quot;:
+    @@nagios_service { &quot;check_nagios_${::hostname}&quot;:
        check_command       =&gt; &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;,
        use                 =&gt; &#39;generic-service&#39;,
        host_name           =&gt; $::fqdn,
@@ -268,7 +268,7 @@ class cd_nagios::server::service (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:45 2017 by
+  Generated on Thu Jul 27 13:58: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_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 Thu Jul 27 13:44:47 2017 by
+  Generated on Thu Jul 27 13:58: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/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
@@ -122,12 +122,18 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/</p>
        <span class='name'>ng_contactgroup_name</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>undef</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>Specify the short name of the
+contact group.</p>
+</div>
+      
    </li>
  
    <li>
@@ -135,12 +141,18 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/</p>
        <span class='name'>ng_contactgroup_alias</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>undef</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>Specify the alias (long name) of the
+contact group</p>
+</div>
+      
    </li>
  
    <li>
@@ -148,12 +160,18 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/</p>
        <span class='name'>ng_contactgroup_register</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>Specify whether the contact group
+should be registered in Nagios.</p>
+</div>
+      
    </li>
  
 </ul>
@@ -166,12 +184,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/</p>
        <pre class="lines">


-24
-25
-26
-27
-28
-29
 30
 31
 32
@@ -186,10 +198,16 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/</p>
 41
 42
 43
-44</pre>
+44
+45
+46
+47
+48
+49
+50</pre>
      </td>
      <td>
-        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contactgroups.pp', line 24</span>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contactgroups.pp', line 30</span>

 define cd_nagios::nagios::objects::add_contactgroups (

@@ -219,7 +237,7 @@ $ng_cntctgrps_rule_erb    = $::cd_nagios::params::ng_cntctgrps_rule_erb
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:47 2017 by
+  Generated on Thu Jul 27 13:58: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/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 Thu Jul 27 13:44:47 2017 by
+  Generated on Thu Jul 27 13:58: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/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 Thu Jul 27 13:44:46 2017 by
+  Generated on Thu Jul 27 13:58: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/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:44:41 2017 by
+  Generated on Thu Jul 27 13:58: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>
--- a/manifests/nagios/objects/add_contactgroups.pp
+++ b/manifests/nagios/objects/add_contactgroups.pp
@@ -20,6 +20,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 # @summary  Define populates /etc/nagios/conf.d/nagios_add_contactgroups through
 #   external puppet rules.
+# @param [string] ng_contactgroup_name Specify the short name of the
+#   contact group.
+# @param  [string]  ng_contactgroup_alias Specify the alias (long name) of the
+#   contact group
+# @param  [string] ng_contactgroup_register Specify whether the contact group
+#   should be registered in Nagios.
 ################################################################################
 define cd_nagios::nagios::objects::add_contactgroups (

--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -37,7 +37,7 @@ class cd_nagios::server::service (
      enable      => true,
    }

-    @@nagios_service { "check_nagios${::hostname}":
+    @@nagios_service { "check_nagios_${::hostname}":
        check_command       => 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios',
        use                 => 'generic-service',
        host_name           => $::fqdn,