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

Auto-merge for build 244

See merge request puppet/confdroid_nagios!9

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html

@@ -334,7 +334,37 @@ and populates /etc/nagios/conf.d/nagios_commands.cfg.
 239
 240
 241
-242</pre>
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/commands.pp', line 8</span>
@@ -572,6 +602,36 @@ class confdroid_nagios::nagios::objects::commands (
       mode         =&gt; &#39;0640&#39;,
       target       =&gt; $ng_target_command,
     }
+
+    @@nagios_command { &#39;check_haproxy&#39;:
+      ensure       =&gt; present,
+      command_name =&gt; &#39;check_haproxy&#39;,
+      command_line =&gt; &#39;$USER1$/check_procs -c $ARG1$ -C $ARG2$&#39;,
+      owner        =&gt; $ng_user,
+      group        =&gt; $ng_user,
+      mode         =&gt; &#39;0640&#39;,
+      target       =&gt; $ng_target_command,
+    }
+
+    @@nagios_command { &#39;check_puppet&#39;:
+      ensure       =&gt; present,
+      command_name =&gt; &#39;check_puppet&#39;,
+      command_line =&gt; &#39;$USER1$/check_procs -c $ARG1$ -C $ARG2$&#39;,
+      owner        =&gt; $ng_user,
+      group        =&gt; $ng_user,
+      mode         =&gt; &#39;0640&#39;,
+      target       =&gt; $ng_target_command,
+    }
+
+    @@nagios_command { &#39;check_puppet_server&#39;:
+      ensure       =&gt; present,
+      command_name =&gt; &#39;check_puppet_server&#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

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