confdroid/confdroid_nagios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: confdroid:master
Branches Tags
confdroid:master
confdroid:1.1.0-3.2026 confdroid:1.0.0-3.2026
..
compare: confdroid:968ed97a1a227c67d519797d75ba0cd776a3ea27
Branches Tags
confdroid:master
confdroid:1.1.0-3.2026 confdroid:1.0.0-3.2026

1 Commits
master ... 968ed97a1a

Author SHA1 Message Date
Jenkins
968ed97a1a Merge branch 'jenkins-build-240' into 'master' 
Auto-merge for build 240

See merge request puppet/confdroid_nagios!5
 2026-09-07 15:48:05 +02:00
5 changed files with 4 additions and 159 deletions
Expand all files Collapse all files

3
README.md
View File

@@ -78,7 +78,6 @@ 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
@@ -340,7 +339,7 @@ All files and directories are configured with correct selinux context. If selinu
## Support
- OS: Rocky 9
- Puppet 7 # Puppet themselves does not support Nagios in Puppet 8 anymore, although it still works
- Puppet 7 # Puppet does not support Nagios in Puppet 8 anymore, although it still works
## Tests

4
doc/file.README.html
View File

@@ -193,8 +193,6 @@
<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>
@@ -449,7 +447,7 @@ Re-type new password:
<ul><li>
<p>OS: Rocky 9</p>
</li><li>
<p>Puppet 7 # Puppet themselves does not support Nagios in Puppet 8 anymore, although it still works</p>
<p>Puppet 7 # Puppet does not support Nagios in Puppet 8 anymore, although it still works</p>
</li></ul>
<h2 id="label-Tests">Tests</h2>

4
doc/index.html
View File

@@ -193,8 +193,6 @@
<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>
@@ -449,7 +447,7 @@ Re-type new password:
<ul><li>
<p>OS: Rocky 9</p>
</li><li>
<p>Puppet 7 # Puppet themselves does not support Nagios in Puppet 8 anymore, although it still works</p>
<p>Puppet 7 # Puppet does not support Nagios in Puppet 8 anymore, although it still works</p>
</li></ul>
<h2 id="label-Tests">Tests</h2>

102
doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
View File

@@ -334,57 +334,7 @@ and populates /etc/nagios/conf.d/nagios_commands.cfg.
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
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292</pre>
242</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/nagios/objects/commands.pp', line 8</span>
@@ -622,56 +572,6 @@ 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,
}
@@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,
}
@@nagios_command { &#39;check_chronyd&#39;:
ensure =&gt; present,
command_name =&gt; &#39;check_chronyd&#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,
}
}
}</pre>
</td>

50
manifests/nagios/objects/commands.pp
View File

@@ -238,55 +238,5 @@ 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,
}
@@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,
}
@@nagios_command { 'check_chronyd':
ensure => present,
command_name => 'check_chronyd',
command_line => '$USER1$/check_procs -c $ARG1$ -C $ARG2$',
owner => $ng_user,
group => $ng_user,
mode => '0640',
target => $ng_target_command,
}
}
}