Recommit for updates in build 31

This commit is contained in:
Jenkins Server
2026-10-04 13:27:36 +02:00
parent d5f6a5ceeb
commit 17c76e14ca
4 changed files with 122 additions and 137 deletions

View File

@@ -119,9 +119,9 @@ class confdroid_ntp::main::config (
) inherits confdroid_ntp::params {
include confdroid_ntp::main::service
# if $ay_manage_nagios == true {
# include confdroid_ntp::monitoring::target
# }
if $cy_manage_nagios == true {
include confdroid_ntp::monitoring::target
}
}</pre>
</td>
</tr>

View File

@@ -104,7 +104,21 @@
6
7
8
9</pre>
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
@@ -112,6 +126,20 @@
class confdroid_ntp::monitoring::target (
) inherits confdroid_ntp::params {
if $cy_manage_nagios == true {
@@nagios_service { &quot;check_chronyd_${fqdn}&quot;:
check_command =&gt; &quot;check_nrpe!check_chronyd!${cy_procs_allowed}!chrony&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; $fqdn,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${fqdn}_check_chronyd&quot;,
target =&gt; $cy_target_service,
owner =&gt; &#39;nagios&#39;,
group =&gt; &#39;nagios&#39;,
mode =&gt; &#39;0640&#39;,
contacts =&gt; $cy_target_contacts,
}
}
}</pre>
</td>
</tr>

View File

@@ -284,6 +284,78 @@
&mdash;
<div class='inline'>
<p>Whether to use a local LAN server or external pool.</p>
</div>
</li>
<li>
<span class='name'>cy_manage_nagios</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to manage Nagios monitoring for the module.</p>
</div>
</li>
<li>
<span class='name'>cy_procs_allowed</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Number of allowed processes for the Nagios check.</p>
</div>
</li>
<li>
<span class='name'>cy_target_service</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/nagios/conf.d/chronyd_service.cfg&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Path to the Nagios service configuration file.</p>
</div>
</li>
<li>
<span class='name'>cy_target_contacts</span>
<span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;admin&#39;]</tt>)</em>
&mdash;
<div class='inline'>
<p>List of Nagios contacts for notifications.</p>
</div>
</li>
@@ -299,10 +371,6 @@
<pre class="lines">
22
23
24
25
26
27
28
@@ -336,10 +404,20 @@
56
57
58
59</pre>
59
60
61
62
63
64
65
66
67
68
69</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 22</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 26</span>
class confdroid_ntp::params (
@@ -357,6 +435,12 @@ class confdroid_ntp::params (
String $cy_leapsectz = &#39;right/UTC&#39;,
String $cy_loginfo = &#39;measurements statistics tracking&#39;,
# monitoring
Boolean $cy_manage_nagios = false,
String $cy_procs_allowed = &#39;1&#39;,
String $cy_target_service = &#39;/etc/nagios/conf.d/chronyd_service.cfg&#39;,
Array $cy_target_contacts = [&#39;admin&#39;],
) {
# facts
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]