Recommit for updates in build 183

This commit is contained in:
Jenkins Server
2026-03-09 14:04:51 +01:00
parent b0cc72be99
commit 3de014c183
2 changed files with 19 additions and 17 deletions

View File

@@ -145,7 +145,8 @@ additional servicegroups through external Puppet rules via define.
41 41
42 42
43 43
44</pre> 44
45</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_servicegroup_rules.pp', line 12</span> <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_servicegroup_rules.pp', line 12</span>
@@ -176,6 +177,7 @@ class confdroid_nagios::nagios::objects::add_servicegroup_rules (
content =&gt; template($ng_tgt_svcgrp_head_erb), content =&gt; template($ng_tgt_svcgrp_head_erb),
order =&gt; &#39;000&#39;, order =&gt; &#39;000&#39;,
} }
# add default servicegroup rules through defines and parameters # add default servicegroup rules through defines and parameters
confdroid_nagios::nagios::objects::add_servicegroups { $ng_servicegroup_name: confdroid_nagios::nagios::objects::add_servicegroups { $ng_servicegroup_name:
ng_servicegroup_name =&gt; $ng_servicegroup_name, ng_servicegroup_name =&gt; $ng_servicegroup_name,

View File

@@ -276,22 +276,22 @@ class confdroid_nagios::server::nagios (
) inherits confdroid_nagios::params { ) inherits confdroid_nagios::params {
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
@@nagios_host { &#39;localhost&#39;: # @@nagios_host { &#39;localhost&#39;:
ensure =&gt; $ng_ping_ensure, # ensure =&gt; $ng_ping_ensure,
alias =&gt; &#39;localhost&#39;, # alias =&gt; &#39;localhost&#39;,
address =&gt; &#39;127.0.0.1&#39;, # address =&gt; &#39;127.0.0.1&#39;,
use =&gt; &#39;linux-server&#39;, # use =&gt; &#39;linux-server&#39;,
target =&gt; $ng_target_localhost, # target =&gt; $ng_target_localhost,
hostgroups =&gt; &#39;linux-servers&#39;, # hostgroups =&gt; &#39;linux-servers&#39;,
contacts =&gt; $ng_contact_name, # contacts =&gt; $ng_contact_name,
max_check_attempts =&gt; $ng_max_check_attempts, # max_check_attempts =&gt; $ng_max_check_attempts,
notification_period =&gt; &#39;24x7&#39;, # notification_period =&gt; &#39;24x7&#39;,
owner =&gt; $ng_user, # owner =&gt; $ng_user,
group =&gt; $ng_user, # group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;, # mode =&gt; &#39;0640&#39;,
check_command =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;, # check_command =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
notify =&gt; Service[$ng_service], # notify =&gt; Service[$ng_service],
} # }
@@nagios_service { &#39;check_nagios_localhost&#39;: @@nagios_service { &#39;check_nagios_localhost&#39;:
check_command =&gt; &quot;check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios&quot;, check_command =&gt; &quot;check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios&quot;,