Merge branch 'jenkins-build-245' into 'master'

Auto-merge for build 245

See merge request puppet/confdroid_nagios!10

README.md

@@ -78,6 +78,7 @@ The current nagios checks are included via `manifests/nagios/commands.pp`:
 - `check_ntp_time`
 - `check_fail2ban`
 - `check_alloy`
+- `check_puppet`, `check_puppet_server`, `check_puppetdb`
 
 ## Repo Documentation
 

doc/file.README.html

@@ -193,6 +193,8 @@
 <p><code>check_fail2ban</code></p>
 </li><li>
 <p><code>check_alloy</code></p>
+</li><li>
+<p><code>check_puppet</code>, <code>check_puppet_server</code>, <code>check_puppetdb</code></p>
 </li></ul>
 
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>

doc/index.html

@@ -193,6 +193,8 @@
 <p><code>check_fail2ban</code></p>
 </li><li>
 <p><code>check_alloy</code></p>
+</li><li>
+<p><code>check_puppet</code>, <code>check_puppet_server</code>, <code>check_puppetdb</code></p>
 </li></ul>
 
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html

@@ -364,7 +364,17 @@ and populates /etc/nagios/conf.d/nagios_commands.cfg.
 269
 270
 271
-272</pre>
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/commands.pp', line 8</span>
@@ -632,6 +642,16 @@ class confdroid_nagios::nagios::objects::commands (
       mode         =&gt; &#39;0640&#39;,
       target       =&gt; $ng_target_command,
     }
+
+    @@nagios_command { &#39;check_puppetdb&#39;:
+      ensure       =&gt; present,
+      command_name =&gt; &#39;check_puppetdb&#39;,
+      command_line =&gt; &#39;$USER1$/check_procs -c $ARG1$ -a $ARG2$&#39;,
+      owner        =&gt; $ng_user,
+      group        =&gt; $ng_user,
+      mode         =&gt; &#39;0640&#39;,
+      target       =&gt; $ng_target_command,
+    }
   }
 }</pre>
       </td>

manifests/nagios/objects/commands.pp

@@ -268,5 +268,15 @@ class confdroid_nagios::nagios::objects::commands (
       mode         => '0640',
       target       => $ng_target_command,
     }
+
+    @@nagios_command { 'check_puppetdb':
+      ensure       => present,
+      command_name => 'check_puppetdb',
+      command_line => '$USER1$/check_procs -c $ARG1$ -a $ARG2$',
+      owner        => $ng_user,
+      group        => $ng_user,
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
   }
 }