Recommit for updates in build 127
This commit is contained in:
@@ -280,23 +280,7 @@
|
||||
182
|
||||
183
|
||||
184
|
||||
185
|
||||
186
|
||||
187
|
||||
188
|
||||
189
|
||||
190
|
||||
191
|
||||
192
|
||||
193
|
||||
194
|
||||
195
|
||||
196
|
||||
197
|
||||
198
|
||||
199
|
||||
200
|
||||
201</pre>
|
||||
185</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
|
||||
@@ -354,28 +338,11 @@ class confdroid_nagios::server::service (
|
||||
contacts => $ng_contact_name,
|
||||
}
|
||||
|
||||
@@nagios_host { $fqdn:
|
||||
ensure => $ng_ping_ensure,
|
||||
alias => $hostname,
|
||||
address => $fqdn,
|
||||
use => 'linux-server',
|
||||
target => $ng_target_host,
|
||||
hostgroups => 'linux-servers',
|
||||
contacts => $ng_contact_name,
|
||||
max_check_attempts => $ng_max_check_attempts,
|
||||
notification_period => '24x7',
|
||||
owner => $ng_user,
|
||||
group => $ng_user,
|
||||
mode => '0640',
|
||||
check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}",
|
||||
notify => Service[$ng_user],
|
||||
}
|
||||
|
||||
@@nagios_service { "root_partition_${hostname}":
|
||||
@@nagios_service { 'root_partition_localhost':
|
||||
ensure => $ng_disk_ensure,
|
||||
check_command => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
|
||||
use => 'generic-service',
|
||||
host_name => $fqdn,
|
||||
host_name => 'localhost',
|
||||
contacts => $ng_contact_name,
|
||||
notification_period => '24x7',
|
||||
service_description => "${hostname}_root_partition",
|
||||
@@ -384,17 +351,18 @@ class confdroid_nagios::server::service (
|
||||
owner => $ng_user,
|
||||
group => $ng_user,
|
||||
mode => '0640',
|
||||
purge => $ng_purge_target,
|
||||
}
|
||||
|
||||
if $ng_enable_swap_check == true {
|
||||
@@nagios_service { "Swap_Usage_${hostname}":
|
||||
@@nagios_service { 'Swap_Usage_localhost':
|
||||
ensure => $ng_swap_ensure,
|
||||
check_command => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
|
||||
use => 'generic-service',
|
||||
host_name => $fqdn,
|
||||
host_name => 'localhost',
|
||||
contacts => $ng_contact_name,
|
||||
notification_period => '24x7',
|
||||
service_description => "${hostname}_swap_usage",
|
||||
service_description => 'localhost_swap_usage',
|
||||
servicegroups => 'linux-services',
|
||||
target => $ng_target_service,
|
||||
owner => $ng_user,
|
||||
@@ -403,14 +371,14 @@ class confdroid_nagios::server::service (
|
||||
}
|
||||
}
|
||||
|
||||
@@nagios_service { "Local_Users_${hostname}":
|
||||
@@nagios_service { 'Local_Users_localhost':
|
||||
ensure => $ng_users_ensure,
|
||||
check_command => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
|
||||
use => 'generic-service',
|
||||
host_name => $fqdn,
|
||||
host_name => 'localhost',
|
||||
contacts => $ng_contact_name,
|
||||
notification_period => '24x7',
|
||||
service_description => "${hostname}_local_users",
|
||||
service_description => 'localhost_local_users',
|
||||
servicegroups => 'linux-services',
|
||||
target => $ng_target_service,
|
||||
owner => $ng_user,
|
||||
@@ -418,14 +386,14 @@ class confdroid_nagios::server::service (
|
||||
mode => '0640',
|
||||
}
|
||||
|
||||
@@nagios_service { "Total Processes_${hostname}":
|
||||
@@nagios_service { 'Total_Processes_localhost':
|
||||
ensure => $ng_procs_tot_ens,
|
||||
check_command => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
|
||||
use => 'generic-service',
|
||||
host_name => $fqdn,
|
||||
host_name => 'localhost',
|
||||
contacts => $ng_contact_name,
|
||||
notification_period => '24x7',
|
||||
service_description => "${hostname}_total_processes",
|
||||
service_description => 'localhost_total_processes',
|
||||
servicegroups => 'linux-services',
|
||||
target => $ng_target_service,
|
||||
owner => $ng_user,
|
||||
@@ -433,14 +401,14 @@ class confdroid_nagios::server::service (
|
||||
mode => '0640',
|
||||
}
|
||||
|
||||
@@nagios_service { "Zombie Processes_${hostname}":
|
||||
@@nagios_service { 'Zombie_Processes_localhost':
|
||||
ensure => $ng_procs_z_ensure,
|
||||
check_command => "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
|
||||
use => 'generic-service',
|
||||
host_name => $fqdn,
|
||||
host_name => 'localhost',
|
||||
contacts => $ng_contact_name,
|
||||
notification_period => '24x7',
|
||||
service_description => "${hostname}_zombie_processes",
|
||||
service_description => 'localhost_zombie_processes',
|
||||
servicegroups => 'linux-services',
|
||||
target => $ng_target_service,
|
||||
owner => $ng_user,
|
||||
@@ -448,14 +416,14 @@ class confdroid_nagios::server::service (
|
||||
mode => '0640',
|
||||
}
|
||||
|
||||
@@nagios_service { "Current_Load_${hostname}":
|
||||
@@nagios_service { 'Current_Load_localhost':
|
||||
ensure => $ng_load_ensure,
|
||||
check_command => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
|
||||
use => 'generic-service',
|
||||
host_name => $fqdn,
|
||||
host_name => 'localhost',
|
||||
contacts => $ng_contact_name,
|
||||
notification_period => '24x7',
|
||||
service_description => "${hostname}_current_load",
|
||||
service_description => 'localhost_current_load',
|
||||
servicegroups => 'linux-services',
|
||||
target => $ng_target_service,
|
||||
owner => $ng_user,
|
||||
|
||||
Reference in New Issue
Block a user