Merge remote-tracking branch 'origin/master' into jenkins-build-59

doc/puppet_classes/confdroid_nrpe_3A_3Acommands_3A_3Adefinition_rules.html

@@ -181,37 +181,7 @@
 77
 78
 79
-80
+80</pre>
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/commands/definition_rules.pp', line 12</span>
@@ -281,38 +251,8 @@ class confdroid_nrpe::commands::definition_rules (
     confdroid_nrpe::commands::definitions { &#39;check_fail2ban&#39;:
       ne_check_name    =&gt; &#39;check_fail2ban&#39;,
       ne_check_cmd     =&gt; &#39;check_procs&#39;,
-      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
-    }
-    confdroid_nrpe::commands::definitions { &#39;check_alloy&#39;:
-      ne_check_name    =&gt; &#39;check_alloy&#39;,
-      ne_check_cmd     =&gt; &#39;check_procs&#39;,
-      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
-    }
-    confdroid_nrpe::commands::definitions { &#39;check_haproxy&#39;:
-      ne_check_name    =&gt; &#39;check_haproxy&#39;,
-      ne_check_cmd     =&gt; &#39;check_procs&#39;,
-      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
-    }
-    confdroid_nrpe::commands::definitions { &#39;check_puppet&#39;:
-      ne_check_name    =&gt; &#39;check_puppet&#39;,
-      ne_check_cmd     =&gt; &#39;check_procs&#39;,
-      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
-    }
-    confdroid_nrpe::commands::definitions { &#39;check_puppet_server&#39;:
-      ne_check_name    =&gt; &#39;check_puppet_server&#39;,
-      ne_check_cmd     =&gt; &#39;check_procs&#39;,
       ne_cmd_argstring =&gt; &#39;-c $ARG1$ -a $ARG2$&#39;,
     }
-    confdroid_nrpe::commands::definitions { &#39;check_puppetdb&#39;:
-      ne_check_name    =&gt; &#39;check_puppetdb&#39;,
-      ne_check_cmd     =&gt; &#39;check_procs&#39;,
-      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -a $ARG2$&#39;,
-    }
-    confdroid_nrpe::commands::definitions { &#39;check_sshd&#39;:
-      ne_check_name    =&gt; &#39;check_sshd&#39;,
-      ne_check_cmd     =&gt; &#39;check_procs&#39;,
-      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -C $ARG2$&#39;,
-    }
   }
 }</pre>
       </td>

manifests/commands/definition_rules.pp

@@ -74,37 +74,7 @@ class confdroid_nrpe::commands::definition_rules (
     confdroid_nrpe::commands::definitions { 'check_fail2ban':
       ne_check_name    => 'check_fail2ban',
       ne_check_cmd     => 'check_procs',
-      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
-    }
-    confdroid_nrpe::commands::definitions { 'check_alloy':
-      ne_check_name    => 'check_alloy',
-      ne_check_cmd     => 'check_procs',
-      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
-    }
-    confdroid_nrpe::commands::definitions { 'check_haproxy':
-      ne_check_name    => 'check_haproxy',
-      ne_check_cmd     => 'check_procs',
-      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
-    }
-    confdroid_nrpe::commands::definitions { 'check_puppet':
-      ne_check_name    => 'check_puppet',
-      ne_check_cmd     => 'check_procs',
-      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
-    }
-    confdroid_nrpe::commands::definitions { 'check_puppet_server':
-      ne_check_name    => 'check_puppet_server',
-      ne_check_cmd     => 'check_procs',
       ne_cmd_argstring => '-c $ARG1$ -a $ARG2$',
     }
-    confdroid_nrpe::commands::definitions { 'check_puppetdb':
-      ne_check_name    => 'check_puppetdb',
-      ne_check_cmd     => 'check_procs',
-      ne_cmd_argstring => '-c $ARG1$ -a $ARG2$',
-    }
-    confdroid_nrpe::commands::definitions { 'check_sshd':
-      ne_check_name    => 'check_sshd',
-      ne_check_cmd     => 'check_procs',
-      ne_cmd_argstring => '-c $ARG1$ -C $ARG2$',
-    }
   }
 }