Merge branch 'jenkins' into 'master'

Jenkins See merge request !53
2017-07-26 14:26:27 +02:00
parent 070dc41e42 5a33b87c5a
commit 12fd85cddc
29 changed files with 85 additions and 29 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,26 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/039523e1f69f07e">039523e1f69f07e</a> Jenkins Server <i>2017-07-26 11:30:54</i>
+<p>
+<h3>recommit for updates in build 99</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a99920d7888b4ca">a99920d7888b4ca</a> Arne Teuke <i>2017-07-26 11:30:34</i>
+<p>
+<h3>linting</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/1ed1db6e8f56d49">1ed1db6e8f56d49</a> Arne Teuke <i>2017-07-26 11:26:16</i>
+<p>
+<h3>linting</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2e52ec411c530eb">2e52ec411c530eb</a> Arne Teuke <i>2017-07-26 11:24:31</i>
+<p>
+<h3>added base contacts and additional contacts</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d395b5f60d08f61">d395b5f60d08f61</a> Jenkins Server <i>2017-07-26 11:16:49</i>
 <p>
 <h3>recommit for updates in build 97</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -221,7 +221,7 @@
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:30:44 2017 by
+  Generated on Wed Jul 26 14:36:27 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 13:30:46 2017 by
+  Generated on Wed Jul 26 14:36:28 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 13:30:45 2017 by
+  Generated on Wed Jul 26 14:36:28 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 13:30:46 2017 by
+  Generated on Wed Jul 26 14:36:29 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:33 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:33 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:33 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:32 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 13:30:49 2017 by
+  Generated on Wed Jul 26 14:36:32 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:32 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 13:30:49 2017 by
+  Generated on Wed Jul 26 14:36:32 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
@@ -228,7 +228,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:30:51 2017 by
+  Generated on Wed Jul 26 14:36:34 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:33 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
@@ -140,7 +140,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 31
 32
 33
-34</pre>
+34
+35</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/config.pp', line 23</span>
@@ -153,6 +154,7 @@ class cd_nagios::nagios::objects::config (

    require cd_nagios::nagios::objects::commands
    require cd_nagios::nagios::objects::template_rules
+    require cd_nagios::nagios::objects::contacts
    require cd_nagios::nagios::objects::add_contact_rules

  }
@@ -164,7 +166,7 @@ class cd_nagios::nagios::objects::config (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:33 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 13:30:51 2017 by
+  Generated on Wed Jul 26 14:36:33 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
@@ -303,7 +303,7 @@ class cd_nagios::nagios::objects::template_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:30:51 2017 by
+  Generated on Wed Jul 26 14:36:33 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
@@ -5552,7 +5552,7 @@ $ng_target_servicegroup   = &quot;${ng_conf_d_dir}/nagios_servicegroup.cfg&quot;
 $ng_target_base_contact   = &quot;${ng_conf_d_dir}/nagios_base_contact.cfg&quot;
 $ng_target_add_contact    = &quot;${ng_conf_d_dir}/nagios_add_contact.cfg&quot;
 $ng_contacts_head_erb     = &#39;cd_nagios/nagios/contacts_cfg_head.erb&#39;
-$ng_contact_rule_erb      = &#39;cd_nagios/nagios/contact_cfg_rule.erb&#39;
+$ng_contacts_rule_erb     = &#39;cd_nagios/nagios/contact_cfg_rule.erb&#39;
 $ng_target_contactgroup   = &quot;${ng_conf_d_dir}/nagios_contactgroup.cfg&quot;
 $ng_target_command        = &quot;${ng_conf_d_dir}/nagios_command.cfg&quot;

@@ -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 13:30:49 2017 by
+  Generated on Wed Jul 26 14:36:32 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:33 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:33 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:33 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 13:30:50 2017 by
+  Generated on Wed Jul 26 14:36:33 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
@@ -202,7 +202,18 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 32
 33
 34
-35</pre>
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contact.pp', line 25</span>
@@ -217,6 +228,17 @@ $ng_contact_groups  = undef,

 ) {

+$ng_nagios_server       = $::cd_nagios::params::ng_nagios_server
+$ng_target_add_contact  = $::cd_nagios::params::ng_target_add_contact
+$ng_contacts_rule_erb   = $::cd_nagios::params::ng_contacts_rule_erb
+
+  if $::fqdn == $ng_nagios_server {
+
+    concat::fragment { $name:
+      target    =&gt;  $ng_target_add_contact,
+      content   =&gt;  template($ng_contacts_rule_erb),
+    }
+  }
 }</pre>
      </td>
    </tr>
@@ -225,7 +247,7 @@ $ng_contact_groups  = undef,
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:30:51 2017 by
+  Generated on Wed Jul 26 14:36:34 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 13:30:51 2017 by
+  Generated on Wed Jul 26 14:36:34 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 13:30:51 2017 by
+  Generated on Wed Jul 26 14:36:34 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 13:30:46 2017 by
+  Generated on Wed Jul 26 14:36:29 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.pp
+++ b/manifests/nagios/objects/add_contact.pp
@@ -32,4 +32,15 @@ $ng_contact_groups  = undef,

 ) {

+$ng_nagios_server       = $::cd_nagios::params::ng_nagios_server
+$ng_target_add_contact  = $::cd_nagios::params::ng_target_add_contact
+$ng_contacts_rule_erb   = $::cd_nagios::params::ng_contacts_rule_erb
+
+  if $::fqdn == $ng_nagios_server {
+
+    concat::fragment { $name:
+      target    =>  $ng_target_add_contact,
+      content   =>  template($ng_contacts_rule_erb),
+    }
+  }
 }
--- a/manifests/nagios/objects/config.pp
+++ b/manifests/nagios/objects/config.pp
@@ -28,6 +28,7 @@ class cd_nagios::nagios::objects::config (

    require cd_nagios::nagios::objects::commands
    require cd_nagios::nagios::objects::template_rules
+    require cd_nagios::nagios::objects::contacts
    require cd_nagios::nagios::objects::add_contact_rules

  }
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -974,7 +974,7 @@ $ng_target_servicegroup   = "${ng_conf_d_dir}/nagios_servicegroup.cfg"
 $ng_target_base_contact   = "${ng_conf_d_dir}/nagios_base_contact.cfg"
 $ng_target_add_contact    = "${ng_conf_d_dir}/nagios_add_contact.cfg"
 $ng_contacts_head_erb     = 'cd_nagios/nagios/contacts_cfg_head.erb'
-$ng_contact_rule_erb      = 'cd_nagios/nagios/contact_cfg_rule.erb'
+$ng_contacts_rule_erb     = 'cd_nagios/nagios/contact_cfg_rule.erb'
 $ng_target_contactgroup   = "${ng_conf_d_dir}/nagios_contactgroup.cfg"
 $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"