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

Auto-merge for build 240

See merge request puppet/confdroid_nagios!5

README.md

@@ -8,6 +8,7 @@
   - [Synopsis](#synopsis)
   - [WARNING](#warning)
   - [Features](#features)
+    - [Currently included custom checks](#currently-included-custom-checks)
   - [Repo Documentation](#repo-documentation)
   - [Dependencies](#dependencies)
   - [Deployment](#deployment)
@@ -52,6 +53,32 @@ At this stage, the module is being redeveloped and being built to the latest sta
 - if `ng_include_nrpe`is set to `true`, the confdroid_nrpe module is automatically applied on clients ([confdroid_nrpe](https://sourcecode.confdroid.com/confdroid/confdroid_nrpe) must be in the catalogue then)
 - if `ng_enable_fail2ban`is set to `true`, a fail2ban jail and filter will be added for the Nagios service (requires confdroid_fail2ban).
 
+### Currently included custom checks
+
+The current nagios checks are included via `manifests/nagios/commands.pp`:
+
+- `check-host-alive`
+- `check_disk`
+- `check_local_load`
+- `check_local_procs`
+- `check_local_users`
+- `check_local_swap`
+- `check_ftp`
+- `check_snmp`
+- `check_http`
+- `check_ssh`
+- `check_ping`
+- `check_tcp`
+- `check_udp`
+- `check_nrpe`
+- `check_nagios`
+- `check_bandwidth`
+- `process-service-perfdata-file`
+- `process-host-perfdata-file`
+- `check_ntp_time`
+- `check_fail2ban`
+- `check_alloy`
+
 ## Repo Documentation
 
 See the full Puppet documentation including parameters in `docs/index.html`

doc/file.README.html

@@ -69,6 +69,9 @@
 <p><a href="#warning">WARNING</a></p>
 </li><li>
 <p><a href="#features">Features</a></p>
+<ul><li>
+<p><a href="#currently-included-custom-checks">Currently included custom checks</a></p>
+</li></ul>
 </li><li>
 <p><a href="#repo-documentation">Repo Documentation</a></p>
 </li><li>
@@ -145,6 +148,53 @@
 <p>if <code>ng_enable_fail2ban</code>is set to <code>true</code>, a fail2ban jail and filter will be added for the Nagios service (requires confdroid_fail2ban).</p>
 </li></ul>
 
+<h3 id="label-Currently+included+custom+checks">Currently included custom checks</h3>
+
+<p>The current nagios checks are included via <code>manifests/nagios/commands.pp</code>:</p>
+<ul><li>
+<p><code>check-host-alive</code></p>
+</li><li>
+<p><code>check_disk</code></p>
+</li><li>
+<p><code>check_local_load</code></p>
+</li><li>
+<p><code>check_local_procs</code></p>
+</li><li>
+<p><code>check_local_users</code></p>
+</li><li>
+<p><code>check_local_swap</code></p>
+</li><li>
+<p><code>check_ftp</code></p>
+</li><li>
+<p><code>check_snmp</code></p>
+</li><li>
+<p><code>check_http</code></p>
+</li><li>
+<p><code>check_ssh</code></p>
+</li><li>
+<p><code>check_ping</code></p>
+</li><li>
+<p><code>check_tcp</code></p>
+</li><li>
+<p><code>check_udp</code></p>
+</li><li>
+<p><code>check_nrpe</code></p>
+</li><li>
+<p><code>check_nagios</code></p>
+</li><li>
+<p><code>check_bandwidth</code></p>
+</li><li>
+<p><code>process-service-perfdata-file</code></p>
+</li><li>
+<p><code>process-host-perfdata-file</code></p>
+</li><li>
+<p><code>check_ntp_time</code></p>
+</li><li>
+<p><code>check_fail2ban</code></p>
+</li><li>
+<p><code>check_alloy</code></p>
+</li></ul>
+
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
 
 <p>See the full Puppet documentation including parameters in <code>docs/index.html</code></p>

doc/index.html

@@ -69,6 +69,9 @@
 <p><a href="#warning">WARNING</a></p>
 </li><li>
 <p><a href="#features">Features</a></p>
+<ul><li>
+<p><a href="#currently-included-custom-checks">Currently included custom checks</a></p>
+</li></ul>
 </li><li>
 <p><a href="#repo-documentation">Repo Documentation</a></p>
 </li><li>
@@ -145,6 +148,53 @@
 <p>if <code>ng_enable_fail2ban</code>is set to <code>true</code>, a fail2ban jail and filter will be added for the Nagios service (requires confdroid_fail2ban).</p>
 </li></ul>
 
+<h3 id="label-Currently+included+custom+checks">Currently included custom checks</h3>
+
+<p>The current nagios checks are included via <code>manifests/nagios/commands.pp</code>:</p>
+<ul><li>
+<p><code>check-host-alive</code></p>
+</li><li>
+<p><code>check_disk</code></p>
+</li><li>
+<p><code>check_local_load</code></p>
+</li><li>
+<p><code>check_local_procs</code></p>
+</li><li>
+<p><code>check_local_users</code></p>
+</li><li>
+<p><code>check_local_swap</code></p>
+</li><li>
+<p><code>check_ftp</code></p>
+</li><li>
+<p><code>check_snmp</code></p>
+</li><li>
+<p><code>check_http</code></p>
+</li><li>
+<p><code>check_ssh</code></p>
+</li><li>
+<p><code>check_ping</code></p>
+</li><li>
+<p><code>check_tcp</code></p>
+</li><li>
+<p><code>check_udp</code></p>
+</li><li>
+<p><code>check_nrpe</code></p>
+</li><li>
+<p><code>check_nagios</code></p>
+</li><li>
+<p><code>check_bandwidth</code></p>
+</li><li>
+<p><code>process-service-perfdata-file</code></p>
+</li><li>
+<p><code>process-host-perfdata-file</code></p>
+</li><li>
+<p><code>check_ntp_time</code></p>
+</li><li>
+<p><code>check_fail2ban</code></p>
+</li><li>
+<p><code>check_alloy</code></p>
+</li></ul>
+
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
 
 <p>See the full Puppet documentation including parameters in <code>docs/index.html</code></p>