Recommit for updates in build 193

This commit is contained in:
Jenkins Server
2026-03-09 15:48:50 +01:00
parent 39a871f697
commit b038d1b602
2 changed files with 35 additions and 3 deletions

View File

@@ -123,7 +123,7 @@ class confdroid_nagios::main::config (
include confdroid_nagios::server::service include confdroid_nagios::server::service
} }
if $fqdn != $ng_nagios_server { if $ng_enable_target == true {
include confdroid_nagios::client::target include confdroid_nagios::client::target
} }
}</pre> }</pre>

View File

@@ -159,7 +159,23 @@
61 61
62 62
63 63
64</pre> 64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -188,6 +204,23 @@ class confdroid_nagios::server::service (
require =&gt; Exec[&#39;ng_restart_httpd&#39;], require =&gt; Exec[&#39;ng_restart_httpd&#39;],
} }
@@nagios_host { &#39;localhost&#39;:
ensure =&gt; $ng_ping_ensure,
alias =&gt; &#39;localhost&#39;,
address =&gt; &#39;127.0.0.1&#39;,
use =&gt; &#39;linux-server&#39;,
target =&gt; $ng_target_localhost,
hostgroups =&gt; &#39;linux-servers&#39;,
contacts =&gt; $ng_contact_name,
max_check_attempts =&gt; $ng_max_check_attempts,
notification_period =&gt; &#39;24x7&#39;,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
check_command =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
notify =&gt; Service[$ng_service],
}
resources { [&#39;nagios_host&#39;, resources { [&#39;nagios_host&#39;,
&#39;nagios_hostgroup&#39;, &#39;nagios_hostgroup&#39;,
&#39;nagios_hostdependency&#39;, &#39;nagios_hostdependency&#39;,
@@ -220,7 +253,6 @@ class confdroid_nagios::server::service (
Nagios_contactgroup &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] } Nagios_contactgroup &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_command &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] } Nagios_command &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
Nagios_timeperiod &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] } Nagios_timeperiod &lt;&lt;||&gt;&gt; { notify =&gt; Service[&#39;nagios&#39;] }
} }
}</pre> }</pre>
</td> </td>