Recommit for updates in build 26

README.md

@@ -76,8 +76,6 @@ 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.
 
-Same goes for the puppetdb service where enabled. 
-
 The modules `confdroid_nagios` and `confdroid_nrpe` include the proper commands already.
 
 ### Optional

doc/file.README.html

@@ -158,8 +158,6 @@
 
 <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>Same goes for the puppetdb service where 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>

doc/index.html

@@ -158,8 +158,6 @@
 
 <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>Same goes for the puppetdb service where 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>

doc/puppet_classes/confdroid_puppet_3A_3Amonitoring_3A_3Atarget.html

@@ -135,24 +135,7 @@
 37
 38
 39
-40
+40</pre>
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
@@ -178,7 +161,7 @@ class confdroid_puppet::monitoring::target (
     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}!puppetserver&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;,
@@ -190,23 +173,6 @@ class confdroid_puppet::monitoring::target (
         contacts            =&gt; $pt_target_contacts,
       }
     }
-
-    if $fqdn == $pt_puppetdb_fqdn and $pt_use_puppetdb == true {
-      # puppetdb service
-      @@nagios_service { &quot;check_puppetdb_${fqdn}&quot;:
-        check_command       =&gt; &quot;check_nrpe!check_puppetdb!${pt_procs_allowed}!puppetdb&quot;,
-        use                 =&gt; &#39;generic-service&#39;,
-        host_name           =&gt; $fqdn,
-        notification_period =&gt; &#39;24x7&#39;,
-        service_description =&gt; &quot;${fqdn}_check_puppetdb&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

@@ -24,7 +24,7 @@ class confdroid_puppet::monitoring::target (
     if $fqdn == $pt_pm_fqdn {
       # puppet server service
       @@nagios_service { "check_puppet_server_${fqdn}":
-        check_command       => "check_nrpe!check_puppet_server!${pt_procs_allowed}!puppetserver",
+        check_command       => "check_nrpe!check_puppet_server!${pt_procs_allowed}!puppet",
         use                 => 'generic-service',
         host_name           => $fqdn,
         notification_period => '24x7',
@@ -36,22 +36,5 @@ class confdroid_puppet::monitoring::target (
         contacts            => $pt_target_contacts,
       }
     }
-
-    if $fqdn == $pt_puppetdb_fqdn and $pt_use_puppetdb == true {
-      # puppetdb service
-      @@nagios_service { "check_puppetdb_${fqdn}":
-        check_command       => "check_nrpe!check_puppetdb!${pt_procs_allowed}!puppetdb",
-        use                 => 'generic-service',
-        host_name           => $fqdn,
-        notification_period => '24x7',
-        service_description => "${fqdn}_check_puppetdb",
-        target              => $pt_target_service,
-        owner               => 'nagios',
-        group               => 'nagios',
-        mode                => '0640',
-        contacts            => $pt_target_contacts,
-      }
-    }
-
   }
 }