recommit for updates in build 117

2017-07-27 15:33:36 +02:00
parent c4f2a37587
commit cba65ddb7c
37 changed files with 165 additions and 95 deletions
--- 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 15:22:38 2017 by
+  Generated on Thu Jul 27 15:33:25 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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33:30 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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33:30 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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33:30 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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33: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_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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33: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_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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33: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_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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33: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_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 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:31 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
@@ -215,7 +215,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 15:22:44 2017 by
+  Generated on Thu Jul 27 15:33:31 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_hostgroup_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html
@@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:31 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_servicegroup_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html
@@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_servicegroup_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:31 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 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:30 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
@@ -146,7 +146,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 37
 38
 39
-40</pre>
+40
+41</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/config.pp', line 23</span>
@@ -167,6 +168,7 @@ class cd_nagios::nagios::objects::config (
    require cd_nagios::nagios::objects::add_hostgroup_rules
    require cd_nagios::nagios::objects::servicegroups
    require cd_nagios::nagios::objects::add_servicegroup_rules
+
  }
 }</pre>
      </td>
@@ -176,7 +178,7 @@ class cd_nagios::nagios::objects::config (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:30 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 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:31 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 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:30 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 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:31 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_3Aservicegroups.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html
@@ -235,7 +235,7 @@ class cd_nagios::nagios::objects::servicegroups (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:31 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 15:22:43 2017 by
+  Generated on Thu Jul 27 15:33:31 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
@@ -83,6 +83,8 @@
      
      <span class='object_link'><a href="cd_nagios_3A_3Aselinux_3A_3Aconfig.html" title="puppet_classes::cd_nagios::selinux::config (puppet_class)">cd_nagios::selinux::config</a></span><br/>
      
+      <span class='object_link'><a href="cd_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_nagios::server::service (puppet_class)">cd_nagios::server::service</a></span><br/>
+      
      <span class='object_link'><a href="cd_nagios_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::cd_nagios::firewall::iptables (puppet_class)">cd_nagios::firewall::iptables</a></span><br/>
      
      <span class='object_link'><a href="cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::cd_nagios::server::access_rules (puppet_class)">cd_nagios::server::access_rules</a></span><br/>
@@ -5614,7 +5616,7 @@ $ng_target_command        = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 15:22:41 2017 by
+  Generated on Thu Jul 27 15:33: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_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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33:30 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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33:30 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 15:22:42 2017 by
+  Generated on Thu Jul 27 15:33:30 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
@@ -193,7 +193,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 84
 85
 86
-87</pre>
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 23</span>
@@ -215,16 +232,33 @@ class cd_nagios::server::service (
      enable      =&gt; true,
    }

-    @@nagios_service { &quot;check_nagios_${::hostname}&quot;:
-        check_command       =&gt; &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;,
+  @@nagios_host { &#39;localhost&#39;:
+      ensure              =&gt;  $ng_ping_ensure,
+      alias               =&gt;  &#39;localhost&#39;,
+      address             =&gt;  &#39;127.0.0.1&#39;,
+      use                 =&gt;  &#39;linux-server&#39;,
+      target              =&gt;  $ng_target_localhost,
+      hostgroups          =&gt;  &#39;linux-servers&#39;,
+      contacts            =&gt;  &#39;ops&#39;,
+      max_check_attempts  =&gt;  $max_check_attempts,
+      notification_period =&gt;  &#39;24x7&#39;,
+      owner               =&gt;  $ng_user,
+      group               =&gt;  $ng_user,
+      mode                =&gt;  &#39;0640&#39;,
+      check_command       =&gt;  &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
+      notify              =&gt;  Service[$ng_service],
+  }
+
+    @@nagios_service { &#39;check_nagios_localhost&#39;:
+        check_command       =&gt; $ng_nagios_service_cmd,
        use                 =&gt; &#39;generic-service&#39;,
-        host_name           =&gt; $::fqdn,
+        host_name           =&gt; &#39;localhost&#39;,
        notification_period =&gt; &#39;24x7&#39;,
-        service_description =&gt;  &quot;${::hostname}_nagios_service&quot;,
-        target              =&gt;  $ng_target_service,
-        owner               =&gt; &#39;nagios&#39;,
-        group               =&gt; &#39;nagios&#39;,
-        mode                =&gt; &#39;0660&#39;,
+        service_description =&gt; &#39;localhost_nagios_service&#39;,
+        target              =&gt; $ng_target_service,
+        owner               =&gt; $ng_user,
+        group               =&gt; $ng_user,
+        mode                =&gt; &#39;0640&#39;,
        contacts            =&gt; &#39;ops&#39;,
    }

@@ -270,7 +304,7 @@ class cd_nagios::server::service (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 14:33:13 2017 by
+  Generated on Thu Jul 27 15:33:30 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>