OP#436 fix service ordering

This commit is contained in:
2026-03-08 16:35:30 +01:00
parent 366129fb49
commit 71bdca24b8
2 changed files with 131 additions and 130 deletions

View File

@@ -6,5 +6,134 @@
class confdroid_nagios::server::nagios ( class confdroid_nagios::server::nagios (
) inherits confdroid_nagios::params { ) inherits confdroid_nagios::params {
# config here if $ng_nagios_server == $fqdn {
@@nagios_host { 'localhost':
ensure => $ng_ping_ensure,
alias => 'localhost',
address => '127.0.0.1',
use => 'linux-server',
target => $ng_target_localhost,
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_service],
}
@@nagios_service { 'check_nagios_localhost':
check_command => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
use => 'generic-service',
host_name => 'localhost',
notification_period => '24x7',
service_description => 'localhost_nagios_service',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
contacts => $ng_contact_name,
notify => Service[$ng_service],
}
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_root_partition',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
if $ng_enable_swap_check == true {
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_swap_usage',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
}
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_local_users',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
@@nagios_service { 'Total_Processes_localhost':
ensure => $ng_procs_tot_ensure,
check_command => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
use => 'generic-service',
host_name => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_total_processes',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_zombie_processes',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_current_load',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
}
} }

View File

@@ -10,6 +10,7 @@ class confdroid_nagios::server::service (
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
require confdroid_nagios::server::access_rules require confdroid_nagios::server::access_rules
require confdroid_nagios::nagios::config require confdroid_nagios::nagios::config
require confdroid_nagios::server::nagios
exec { 'ng_restart_httpd': exec { 'ng_restart_httpd':
command => 'systemctl restart httpd', command => 'systemctl restart httpd',
@@ -26,135 +27,6 @@ class confdroid_nagios::server::service (
require => Exec['ng_restart_httpd'], require => Exec['ng_restart_httpd'],
} }
@@nagios_host { 'localhost':
ensure => $ng_ping_ensure,
alias => 'localhost',
address => '127.0.0.1',
use => 'linux-server',
target => $ng_target_localhost,
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_service],
}
@@nagios_service { 'check_nagios_localhost':
check_command => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
use => 'generic-service',
host_name => 'localhost',
notification_period => '24x7',
service_description => 'localhost_nagios_service',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
contacts => $ng_contact_name,
notify => Service[$ng_service],
}
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_root_partition',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
if $ng_enable_swap_check == true {
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_swap_usage',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
}
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_local_users',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
@@nagios_service { 'Total_Processes_localhost':
ensure => $ng_procs_tot_ensure,
check_command => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
use => 'generic-service',
host_name => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_total_processes',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_zombie_processes',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
@@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 => 'localhost',
contacts => $ng_contact_name,
notification_period => '24x7',
service_description => 'localhost_current_load',
servicegroups => 'linux-services',
target => $ng_target_service,
owner => $ng_user,
group => $ng_user,
mode => '0640',
notify => Service[$ng_service],
}
resources { ['nagios_host', resources { ['nagios_host',
'nagios_hostgroup', 'nagios_hostgroup',
'nagios_hostdependency', 'nagios_hostdependency',