Compare commits

1 Commits

Author SHA1 Message Date
Jenkins
46e788d290 Merge branch 'jenkins-build-238' into 'master'
Auto-merge for build 238

See merge request puppet/confdroid_nagios!3
2026-09-07 14:13:10 +02:00
5 changed files with 1 additions and 248 deletions

View File

@@ -8,7 +8,6 @@
- [Synopsis](#synopsis)
- [WARNING](#warning)
- [Features](#features)
- [Currently included custom checks](#currently-included-custom-checks)
- [Repo Documentation](#repo-documentation)
- [Dependencies](#dependencies)
- [Deployment](#deployment)
@@ -53,32 +52,6 @@ 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`

View File

@@ -69,9 +69,6 @@
<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>
@@ -148,53 +145,6 @@
<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>

View File

@@ -69,9 +69,6 @@
<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>
@@ -148,53 +145,6 @@
<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>

View File

@@ -324,47 +324,7 @@ and populates /etc/nagios/conf.d/nagios_commands.cfg.
229
230
231
232
233
234
235
236
237
238
239
240
241
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>
232</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/nagios/objects/commands.pp', line 8</span>
@@ -592,46 +552,6 @@ class confdroid_nagios::nagios::objects::commands (
mode =&gt; &#39;0640&#39;,
target =&gt; $ng_target_command,
}
@@nagios_command { &#39;check_alloy&#39;:
ensure =&gt; present,
command_name =&gt; &#39;check_alloy&#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_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>

View File

@@ -228,45 +228,5 @@ class confdroid_nagios::nagios::objects::commands (
mode => '0640',
target => $ng_target_command,
}
@@nagios_command { 'check_alloy':
ensure => present,
command_name => 'check_alloy',
command_line => '$USER1$/check_procs -c $ARG1$ -C $ARG2$',
owner => $ng_user,
group => $ng_user,
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,
}
}
}