Recommit for updates in build 186

This commit is contained in:
Jenkins Server
2026-03-09 14:46:11 +01:00
parent b85843b3c7
commit 6485cff671
2 changed files with 122 additions and 122 deletions

View File

@@ -123,7 +123,7 @@ class confdroid_nagios::nagios::config (
) inherits confdroid_nagios::params { ) inherits confdroid_nagios::params {
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
require confdroid_nagios::nagios::objects::commands # require confdroid_nagios::nagios::objects::commands
require confdroid_nagios::nagios::objects::template_rules require confdroid_nagios::nagios::objects::template_rules
require confdroid_nagios::nagios::objects::add_contact_rules require confdroid_nagios::nagios::objects::add_contact_rules
require confdroid_nagios::nagios::objects::add_contactgroups_rules require confdroid_nagios::nagios::objects::add_contactgroups_rules

View File

@@ -276,134 +276,134 @@ class confdroid_nagios::server::nagios (
) inherits confdroid_nagios::params { ) inherits confdroid_nagios::params {
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
# @@nagios_host { 'localhost': @@nagios_host { 'localhost':
# ensure => $ng_ping_ensure, ensure => $ng_ping_ensure,
# alias => 'localhost', alias => 'localhost',
# address => '127.0.0.1', address => '127.0.0.1',
# use => 'linux-server', use => 'linux-server',
# target => $ng_target_localhost, target => $ng_target_localhost,
# hostgroups => 'linux-servers', hostgroups => 'linux-servers',
# contacts => $ng_contact_name, contacts => $ng_contact_name,
# max_check_attempts => $ng_max_check_attempts, max_check_attempts => $ng_max_check_attempts,
# notification_period => '24x7', notification_period => '24x7',
# owner => $ng_user, owner => $ng_user,
# group => $ng_user, group => $ng_user,
# mode => '0640', mode => '0640',
# check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}",
# notify => Service[$ng_service], notify => Service[$ng_service],
# } }
# @@nagios_service { 'check_nagios_localhost': @@nagios_service { 'check_nagios_localhost':
# check_command => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios", check_command => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
# use => 'generic-service', use => 'generic-service',
# host_name => 'localhost', host_name => 'localhost',
# notification_period => '24x7', notification_period => '24x7',
# service_description => 'localhost_nagios_service', service_description => 'localhost_nagios_service',
# target => $ng_target_service, target => $ng_target_service,
# owner => $ng_user, owner => $ng_user,
# group => $ng_user, group => $ng_user,
# mode => '0640', mode => '0640',
# contacts => $ng_contact_name, contacts => $ng_contact_name,
# notify => Service[$ng_service], notify => Service[$ng_service],
# } }
# @@nagios_service { 'root_partition_localhost': @@nagios_service { 'root_partition_localhost':
# ensure => $ng_disk_ensure, ensure => $ng_disk_ensure,
# check_command => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/", check_command => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
# use => 'generic-service', use => 'generic-service',
# host_name => 'localhost', host_name => 'localhost',
# contacts => $ng_contact_name, contacts => $ng_contact_name,
# notification_period => '24x7', notification_period => '24x7',
# service_description => 'localhost_root_partition', service_description => 'localhost_root_partition',
# servicegroups => 'linux-services', servicegroups => 'linux-services',
# target => $ng_target_service, target => $ng_target_service,
# owner => $ng_user, owner => $ng_user,
# group => $ng_user, group => $ng_user,
# mode => '0640', mode => '0640',
# notify => Service[$ng_service], notify => Service[$ng_service],
# } }
# if $ng_enable_swap_check == true { if $ng_enable_swap_check == true {
# @@nagios_service { 'Swap_Usage_localhost': @@nagios_service { 'Swap_Usage_localhost':
# ensure => $ng_swap_ensure, ensure => $ng_swap_ensure,
# check_command => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}", check_command => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
# use => 'generic-service', use => 'generic-service',
# host_name => 'localhost', host_name => 'localhost',
# contacts => $ng_contact_name, contacts => $ng_contact_name,
# notification_period => '24x7', notification_period => '24x7',
# service_description => 'localhost_swap_usage', service_description => 'localhost_swap_usage',
# servicegroups => 'linux-services', servicegroups => 'linux-services',
# target => $ng_target_service, target => $ng_target_service,
# owner => $ng_user, owner => $ng_user,
# group => $ng_user, group => $ng_user,
# mode => '0640', mode => '0640',
# notify => Service[$ng_service], notify => Service[$ng_service],
# } }
# } }
# @@nagios_service { 'Local_Users_localhost': @@nagios_service { 'Local_Users_localhost':
# ensure => $ng_users_ensure, ensure => $ng_users_ensure,
# check_command => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}", check_command => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
# use => 'generic-service', use => 'generic-service',
# host_name => 'localhost', host_name => 'localhost',
# contacts => $ng_contact_name, contacts => $ng_contact_name,
# notification_period => '24x7', notification_period => '24x7',
# service_description => 'localhost_local_users', service_description => 'localhost_local_users',
# servicegroups => 'linux-services', servicegroups => 'linux-services',
# target => $ng_target_service, target => $ng_target_service,
# owner => $ng_user, owner => $ng_user,
# group => $ng_user, group => $ng_user,
# mode => '0640', mode => '0640',
# notify => Service[$ng_service], notify => Service[$ng_service],
# } }
# @@nagios_service { 'Total_Processes_localhost': @@nagios_service { 'Total_Processes_localhost':
# ensure => $ng_procs_tot_ensure, ensure => $ng_procs_tot_ensure,
# check_command => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}", check_command => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
# use => 'generic-service', use => 'generic-service',
# host_name => 'localhost', host_name => 'localhost',
# contacts => $ng_contact_name, contacts => $ng_contact_name,
# notification_period => '24x7', notification_period => '24x7',
# service_description => 'localhost_total_processes', service_description => 'localhost_total_processes',
# servicegroups => 'linux-services', servicegroups => 'linux-services',
# target => $ng_target_service, target => $ng_target_service,
# owner => $ng_user, owner => $ng_user,
# group => $ng_user, group => $ng_user,
# mode => '0640', mode => '0640',
# notify => Service[$ng_service], notify => Service[$ng_service],
# } }
# @@nagios_service { 'Zombie_Processes_localhost': @@nagios_service { 'Zombie_Processes_localhost':
# ensure => $ng_procs_z_ensure, ensure => $ng_procs_z_ensure,
# check_command => "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}", check_command => "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
# use => 'generic-service', use => 'generic-service',
# host_name => 'localhost', host_name => 'localhost',
# contacts => $ng_contact_name, contacts => $ng_contact_name,
# notification_period => '24x7', notification_period => '24x7',
# service_description => 'localhost_zombie_processes', service_description => 'localhost_zombie_processes',
# servicegroups => 'linux-services', servicegroups => 'linux-services',
# target => $ng_target_service, target => $ng_target_service,
# owner => $ng_user, owner => $ng_user,
# group => $ng_user, group => $ng_user,
# mode => '0640', mode => '0640',
# notify => Service[$ng_service], notify => Service[$ng_service],
# } }
# @@nagios_service { 'Current_Load_localhost': @@nagios_service { 'Current_Load_localhost':
# ensure => $ng_load_ensure, ensure => $ng_load_ensure,
# check_command => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}", check_command => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
# use => 'generic-service', use => 'generic-service',
# host_name => 'localhost', host_name => 'localhost',
# contacts => $ng_contact_name, contacts => $ng_contact_name,
# notification_period => '24x7', notification_period => '24x7',
# service_description => 'localhost_current_load', service_description => 'localhost_current_load',
# servicegroups => 'linux-services', servicegroups => 'linux-services',
# target => $ng_target_service, target => $ng_target_service,
# owner => $ng_user, owner => $ng_user,
# group => $ng_user, group => $ng_user,
# mode => '0640', mode => '0640',
# notify => Service[$ng_service], notify => Service[$ng_service],
# } }
resources { ['nagios_host', resources { ['nagios_host',
'nagios_hostgroup', 'nagios_hostgroup',