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

Auto-merge for build 242

See merge request puppet/confdroid_nagios!7

README.md

@@ -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
 

doc/file.README.html

@@ -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>

doc/index.html

@@ -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>

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html

@@ -354,37 +354,7 @@ and populates /etc/nagios/conf.d/nagios_commands.cfg.
 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>
+262</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/commands.pp', line 8</span>
@@ -642,36 +612,6 @@ class confdroid_nagios::nagios::objects::commands (
       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>

manifests/nagios/objects/commands.pp

@@ -258,35 +258,5 @@ class confdroid_nagios::nagios::objects::commands (
       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,
-    }
   }
 }