Recommit for updates in build 25

README.md

@@ -11,7 +11,6 @@
     - [Puppet server and agent](#puppet-server-and-agent)
     - [Firewall](#firewall)
     - [Directories, Files and Services](#directories-files-and-services)
-    - [Nagios monitoring](#nagios-monitoring)
     - [Optional](#optional)
       - [R10k service](#r10k-service)
       - [R10k Web hook](#r10k-web-hook)
@@ -61,23 +60,6 @@ This module is also designed to work with [Foreman][def]  as External Node Class
   permissions and selinux context
 - start services as required
 
-### Nagios monitoring
-
-When `$pt_manage_nagios` is `true`, the module exports a Puppet agent check on
-every node and a Puppet Server check on the Puppet Server node. The target
-Nagios installation must provide the NRPE command alias used by the export.
-The Puppet Server check can use the standard `check_procs` plugin:
-
-```ini
-command[check_puppet_server]=/usr/lib64/nagios/plugins/check_procs -c $ARG1$ -a $ARG2$
-```
-
-With the exported command, `check_puppet_server!1:!puppetserver` alerts when no
-running process has `puppetserver` in its full command line. It does not check
-whether the systemd service is enabled.
-
-The modules `confdroid_nagios` and `confdroid_nrpe` include the proper commands already.
-
 ### Optional
 
 #### R10k service

doc/file.README.html

@@ -76,8 +76,6 @@
 </li><li>
 <p><a href="#directories-files-and-services">Directories, Files and Services</a></p>
 </li><li>
-<p><a href="#nagios-monitoring">Nagios monitoring</a></p>
-</li><li>
 <p><a href="#optional">Optional</a></p>
 </li><li>
 <p><a href="#r10k-service">R10k service</a></p>
@@ -149,17 +147,6 @@
 <p>start services as required</p>
 </li></ul>
 
-<h3 id="label-Nagios+monitoring">Nagios monitoring</h3>
-
-<p>When <code>$pt_manage_nagios</code> is <code>true</code>, the module exports a Puppet agent check on every node and a Puppet Server check on the Puppet Server node. The target Nagios installation must provide the NRPE command alias used by the export. The Puppet Server check can use the standard <code>check_procs</code> plugin:</p>
-
-<pre class="code ruby"><code class="ruby">command[check_puppet_server]=/usr/lib64/nagios/plugins/check_procs -c $ARG1$ -a $ARG2$
-</code></pre>
-
-<p>With the exported command, <code>check_puppet_server!1:!puppetserver</code> alerts when no running process has <code>puppetserver</code> in its full command line. It does not check whether the systemd service is enabled.</p>
-
-<p>The modules <code>confdroid_nagios</code> and <code>confdroid_nrpe</code> include the proper commands already.</p>
-
 <h3 id="label-Optional">Optional</h3>
 
 <h4 id="label-R10k+service">R10k service</h4>

doc/index.html

@@ -76,8 +76,6 @@
 </li><li>
 <p><a href="#directories-files-and-services">Directories, Files and Services</a></p>
 </li><li>
-<p><a href="#nagios-monitoring">Nagios monitoring</a></p>
-</li><li>
 <p><a href="#optional">Optional</a></p>
 </li><li>
 <p><a href="#r10k-service">R10k service</a></p>
@@ -149,17 +147,6 @@
 <p>start services as required</p>
 </li></ul>
 
-<h3 id="label-Nagios+monitoring">Nagios monitoring</h3>
-
-<p>When <code>$pt_manage_nagios</code> is <code>true</code>, the module exports a Puppet agent check on every node and a Puppet Server check on the Puppet Server node. The target Nagios installation must provide the NRPE command alias used by the export. The Puppet Server check can use the standard <code>check_procs</code> plugin:</p>
-
-<pre class="code ruby"><code class="ruby">command[check_puppet_server]=/usr/lib64/nagios/plugins/check_procs -c $ARG1$ -a $ARG2$
-</code></pre>
-
-<p>With the exported command, <code>check_puppet_server!1:!puppetserver</code> alerts when no running process has <code>puppetserver</code> in its full command line. It does not check whether the systemd service is enabled.</p>
-
-<p>The modules <code>confdroid_nagios</code> and <code>confdroid_nrpe</code> include the proper commands already.</p>
-
 <h3 id="label-Optional">Optional</h3>
 
 <h4 id="label-R10k+service">R10k service</h4>

doc/puppet_classes/confdroid_puppet_3A_3Amonitoring_3A_3Atarget.html

@@ -118,24 +118,7 @@
 20
 21
 22
-23
+23</pre>
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
@@ -144,7 +127,6 @@ class confdroid_puppet::monitoring::target (
 
 ) inherits confdroid_puppet::params {
   if $pt_manage_nagios == true {
-    # puppet agent service
     @@nagios_service { &quot;check_puppet_${fqdn}&quot;:
       check_command       =&gt; &quot;check_nrpe!check_puppet!${pt_procs_allowed}!puppet&quot;,
       use                 =&gt; &#39;generic-service&#39;,
@@ -157,22 +139,6 @@ class confdroid_puppet::monitoring::target (
       mode                =&gt; &#39;0640&#39;,
       contacts            =&gt; $pt_target_contacts,
     }
-
-    if $fqdn == $pt_pm_fqdn {
-      # puppet server service
-      @@nagios_service { &quot;check_puppet_server_${fqdn}&quot;:
-        check_command       =&gt; &quot;check_nrpe!check_puppet_server!${pt_procs_allowed}!puppet&quot;,
-        use                 =&gt; &#39;generic-service&#39;,
-        host_name           =&gt; $fqdn,
-        notification_period =&gt; &#39;24x7&#39;,
-        service_description =&gt; &quot;${fqdn}_check_puppet_server&quot;,
-        target              =&gt; $pt_target_service,
-        owner               =&gt; &#39;nagios&#39;,
-        group               =&gt; &#39;nagios&#39;,
-        mode                =&gt; &#39;0640&#39;,
-        contacts            =&gt; $pt_target_contacts,
-      }
-    }
   }
 }</pre>
       </td>

manifests/monitoring/target.pp

@@ -7,7 +7,6 @@ class confdroid_puppet::monitoring::target (
 
 ) inherits confdroid_puppet::params {
   if $pt_manage_nagios == true {
-    # puppet agent service
     @@nagios_service { "check_puppet_${fqdn}":
       check_command       => "check_nrpe!check_puppet!${pt_procs_allowed}!puppet",
       use                 => 'generic-service',
@@ -20,21 +19,5 @@ class confdroid_puppet::monitoring::target (
       mode                => '0640',
       contacts            => $pt_target_contacts,
     }
-
-    if $fqdn == $pt_pm_fqdn {
-      # puppet server service
-      @@nagios_service { "check_puppet_server_${fqdn}":
-        check_command       => "check_nrpe!check_puppet_server!${pt_procs_allowed}!puppet",
-        use                 => 'generic-service',
-        host_name           => $fqdn,
-        notification_period => '24x7',
-        service_description => "${fqdn}_check_puppet_server",
-        target              => $pt_target_service,
-        owner               => 'nagios',
-        group               => 'nagios',
-        mode                => '0640',
-        contacts            => $pt_target_contacts,
-      }
-    }
   }
 }