Recommit for updates in build 91

This commit is contained in:
Jenkins Server
2026-03-01 15:31:42 +01:00
parent ca5fdbf711
commit 4b89b63b4c
2 changed files with 178 additions and 54 deletions

View File

@@ -155,14 +155,14 @@ class confdroid_nagios::nagios::objects::add_contactgroups_rules (
concat { $ng_tgt_contactgroup_add: concat { $ng_tgt_contactgroup_add:
ensure => present, ensure => present,
path => $ng_tgt_contactgroup_add, path => $ng_tgt_contactgroup_add,
owner => $ng_user, owner => 'nagios',
group => $ng_user, group => 'nagios',
mode => '0640', mode => '0640',
selrange => s0, selrange => s0,
selrole => object_r, selrole => object_r,
seltype => nagios_etc_t, seltype => nagios_etc_t,
seluser => system_u, seluser => system_u,
notify => Service[$ng_service], notify => Service[$ng_nagios_service],
} }
# manage file header # manage file header

View File

@@ -314,6 +314,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;100.0,20%&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;100.0,20%&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The warning threshold for the check_ping command. Default is 100.0,20%.</p>
</div>
</li> </li>
<li> <li>
@@ -327,6 +332,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;500.0,60%&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;500.0,60%&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The critical threshold for the check_ping command. Default is 500.0,60%.</p>
</div>
</li> </li>
<li> <li>
@@ -340,6 +350,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The ensure value for the check_ping command. Default is present.</p>
</div>
</li> </li>
<li> <li>
@@ -353,6 +368,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;20%&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;20%&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The warning threshold for the check_disk command. Default is 20%.</p>
</div>
</li> </li>
<li> <li>
@@ -366,6 +386,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;10%&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;10%&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The critical threshold for the check_disk command. Default is 10%.</p>
</div>
</li> </li>
<li> <li>
@@ -379,6 +404,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The ensure value for the check_disk command. Default is present.</p>
</div>
</li> </li>
<li> <li>
@@ -392,6 +422,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;20&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;20&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The warning threshold for the check_swap command. Default is 20.</p>
</div>
</li> </li>
<li> <li>
@@ -405,6 +440,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;10&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;10&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The critical threshold for the check_swap command. Default is 10.</p>
</div>
</li> </li>
<li> <li>
@@ -418,6 +458,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The ensure value for the check_swap command. Default is present.</p>
</div>
</li> </li>
<li> <li>
@@ -431,6 +476,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;20&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;20&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The warning threshold for the check_users command. Default is 20.</p>
</div>
</li> </li>
<li> <li>
@@ -444,6 +494,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;50&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;50&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The critical threshold for the check_users command. Default is 50.</p>
</div>
</li> </li>
<li> <li>
@@ -457,6 +512,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The ensure value for the check_users command. Default is present.</p>
</div>
</li> </li>
<li> <li>
@@ -470,6 +530,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;330&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;330&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The warning threshold for the check_procs command with total processes. Default is 330.</p>
</div>
</li> </li>
<li> <li>
@@ -483,6 +548,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;400&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;400&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The critical threshold for the check_procs command with total processes. Default is 400.</p>
</div>
</li> </li>
<li> <li>
@@ -496,18 +566,26 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;RDST&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;RDST&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The parameters for the check_procs command with total processes. Default is RDST.</p>
</div>
</li> </li>
<li> <li>
<span class='name'>ng_procs_tot_ens</span> <span class='name'>ng_procs_tot_ensure</span>
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The ensure value for the check_procs command with total processes. Default is present.</p>
</div>
</li> </li>
@@ -522,6 +600,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;10&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;10&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The warning threshold for the check_procs command with zombie processes. Default is 10.</p>
</div>
</li> </li>
<li> <li>
@@ -535,6 +618,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The critical threshold for the check_procs command with zombie processes. Default is 30.</p>
</div>
</li> </li>
<li> <li>
@@ -548,6 +636,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;Z&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;Z&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The parameters for the check_procs command with zombie processes. Default is Z.</p>
</div>
</li> </li>
<li> <li>
@@ -561,6 +654,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The ensure value for the check_procs command with zombie processes. Default is present.</p>
</div>
</li> </li>
<li> <li>
@@ -574,6 +672,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;5.00,4.00,3.00&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;5.00,4.00,3.00&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The warning threshold for the check_load command. Default is 5.00,4.00,3.00.</p>
</div>
</li> </li>
<li> <li>
@@ -587,6 +690,11 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;10.00,6.00,4.00&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;10.00,6.00,4.00&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The critical threshold for the check_load command. Default is 10.00,6.00,4.00.</p>
</div>
</li> </li>
<li> <li>
@@ -600,6 +708,24 @@ inherited by all classes except defines.
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The ensure value for the check_load command. Default is present.</p>
</div>
</li>
<li>
<span class='name'>ng_procs_tot_ens</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
</li> </li>
</ul> </ul>
@@ -613,52 +739,6 @@ inherited by all classes except defines.
<pre class="lines"> <pre class="lines">
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77 77
78 78
79 79
@@ -759,10 +839,55 @@ inherited by all classes except defines.
174 174
175 175
176 176
177</pre> 177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 31</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 77</span>
class confdroid_nagios::params ( class confdroid_nagios::params (
@@ -816,7 +941,6 @@ class confdroid_nagios::params (
String $ng_load_crit = &#39;10.00,6.00,4.00&#39;, String $ng_load_crit = &#39;10.00,6.00,4.00&#39;,
String $ng_load_ensure = &#39;present&#39;, String $ng_load_ensure = &#39;present&#39;,
) { ) {
# Default facts # Default facts
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;] $fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]