Recommit for updates in build 178

This commit is contained in:
Jenkins Server
2026-03-08 16:37:05 +01:00
parent df0823c6bd
commit 4f531fc3b8
2 changed files with 262 additions and 260 deletions

View File

@@ -105,7 +105,136 @@
7
8
9
10</pre>
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/nagios.pp', line 6</span>
@@ -113,7 +242,136 @@
class confdroid_nagios::server::nagios (
) inherits confdroid_nagios::params {
# config here
if $ng_nagios_server == $fqdn {
@@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],
}
@@nagios_service { &#39;check_nagios_localhost&#39;:
check_command =&gt; &quot;check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_nagios_service&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
contacts =&gt; $ng_contact_name,
notify =&gt; Service[$ng_service],
}
@@nagios_service { &#39;root_partition_localhost&#39;:
ensure =&gt; $ng_disk_ensure,
check_command =&gt; &quot;check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_root_partition&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
if $ng_enable_swap_check == true {
@@nagios_service { &#39;Swap_Usage_localhost&#39;:
ensure =&gt; $ng_swap_ensure,
check_command =&gt; &quot;check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_swap_usage&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
}
@@nagios_service { &#39;Local_Users_localhost&#39;:
ensure =&gt; $ng_users_ensure,
check_command =&gt; &quot;check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_local_users&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
@@nagios_service { &#39;Total_Processes_localhost&#39;:
ensure =&gt; $ng_procs_tot_ensure,
check_command =&gt; &quot;check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_total_processes&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
@@nagios_service { &#39;Zombie_Processes_localhost&#39;:
ensure =&gt; $ng_procs_z_ensure,
check_command =&gt; &quot;check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_zombie_processes&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
@@nagios_service { &#39;Current_Load_localhost&#39;:
ensure =&gt; $ng_load_ensure,
check_command =&gt; &quot;check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_current_load&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
}
}</pre>
</td>
</tr>

View File

@@ -158,135 +158,7 @@
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191</pre>
63</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -298,6 +170,7 @@ class confdroid_nagios::server::service (
if $ng_nagios_server == $fqdn {
require confdroid_nagios::server::access_rules
require confdroid_nagios::nagios::config
require confdroid_nagios::server::nagios
exec { &#39;ng_restart_httpd&#39;:
command =&gt; &#39;systemctl restart httpd&#39;,
@@ -314,135 +187,6 @@ class confdroid_nagios::server::service (
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],
}
@@nagios_service { &#39;check_nagios_localhost&#39;:
check_command =&gt; &quot;check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_nagios_service&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
contacts =&gt; $ng_contact_name,
notify =&gt; Service[$ng_service],
}
@@nagios_service { &#39;root_partition_localhost&#39;:
ensure =&gt; $ng_disk_ensure,
check_command =&gt; &quot;check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_root_partition&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
if $ng_enable_swap_check == true {
@@nagios_service { &#39;Swap_Usage_localhost&#39;:
ensure =&gt; $ng_swap_ensure,
check_command =&gt; &quot;check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_swap_usage&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
}
@@nagios_service { &#39;Local_Users_localhost&#39;:
ensure =&gt; $ng_users_ensure,
check_command =&gt; &quot;check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_local_users&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
@@nagios_service { &#39;Total_Processes_localhost&#39;:
ensure =&gt; $ng_procs_tot_ensure,
check_command =&gt; &quot;check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_total_processes&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
@@nagios_service { &#39;Zombie_Processes_localhost&#39;:
ensure =&gt; $ng_procs_z_ensure,
check_command =&gt; &quot;check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_zombie_processes&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
@@nagios_service { &#39;Current_Load_localhost&#39;:
ensure =&gt; $ng_load_ensure,
check_command =&gt; &quot;check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}&quot;,
use =&gt; &#39;generic-service&#39;,
host_name =&gt; &#39;localhost&#39;,
contacts =&gt; $ng_contact_name,
notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &#39;localhost_current_load&#39;,
servicegroups =&gt; &#39;linux-services&#39;,
target =&gt; $ng_target_service,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
notify =&gt; Service[$ng_service],
}
resources { [&#39;nagios_host&#39;,
&#39;nagios_hostgroup&#39;,
&#39;nagios_hostdependency&#39;,