From 7ab909e4422559263507660c0a3ca1892a3a41dd Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 1 Mar 2026 18:54:29 +0100 Subject: [PATCH] Recommit for updates in build 113 --- ...fdroid_nagios_3A_3Aclient_3A_3Atarget.html | 188 +++++++++--------- .../confdroid_nagios_3A_3Aparams.html | 28 ++- 2 files changed, 118 insertions(+), 98 deletions(-) diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html index 156bb5c..3bfff7f 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html @@ -226,118 +226,118 @@ class confdroid_nagios::client::target ( ) inherits confdroid_nagios::params { - if $ng_nagios_server == $fqdn { + if ($ng_nagios_server == $fqdn) and ($ng_enable_target == true) { if $ng_include_nrpe == true { require confdroid_nrpe + } - @@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 => 'nagios', - group => 'nagios', - mode => '0640', - check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", - notify => Service[$ng_service], - } + @@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 => 'nagios', + group => 'nagios', + mode => '0640', + check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", + notify => Service[$ng_service], + } - @@nagios_service { "root_partition_${fqdn}": - ensure => $ng_disk_ensure, - check_command => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/", + @@nagios_service { "root_partition_${fqdn}": + ensure => $ng_disk_ensure, + check_command => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/", + use => 'generic-service', + host_name => $fqdn, + contacts => $ng_contact_name, + notification_period => '24x7', + service_description => "${fqdn}_root_partition", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => 'nagios', + group => 'nagios', + mode => '0640', + } + + if $ng_enable_swap_check == true { + @@nagios_service { "Swap_Usage_${fqdn}": + ensure => $ng_swap_ensure, + check_command => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}", use => 'generic-service', host_name => $fqdn, contacts => $ng_contact_name, notification_period => '24x7', - service_description => "${fqdn}_root_partition", + service_description => "${fqdn}_swap_usage", servicegroups => 'linux-services', target => $ng_target_service, owner => 'nagios', group => 'nagios', mode => '0640', } + } - if $ng_enable_swap_check == true { - @@nagios_service { "Swap_Usage_${fqdn}": - ensure => $ng_swap_ensure, - check_command => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}", - use => 'generic-service', - host_name => $fqdn, - contacts => $ng_contact_name, - notification_period => '24x7', - service_description => "${fqdn}_swap_usage", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0640', - } - } + @@nagios_service { "Local_Users_${fqdn}": + ensure => $ng_users_ensure, + check_command => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}", + use => 'generic-service', + host_name => $fqdn, + contacts => $ng_contact_name, + notification_period => '24x7', + service_description => "${fqdn}_local_users", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => 'nagios', + group => 'nagios', + mode => '0640', + } - @@nagios_service { "Local_Users_${fqdn}": - ensure => $ng_users_ensure, - check_command => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}", - use => 'generic-service', - host_name => $fqdn, - contacts => $ng_contact_name, - notification_period => '24x7', - service_description => "${fqdn}_local_users", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0640', - } + @@nagios_service { "Total Processes_${fqdn}": + 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, + contacts => $ng_contact_name, + notification_period => '24x7', + service_description => "${fqdn}_total_processes", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => 'nagios', + group => 'nagios', + mode => '0640', + } - @@nagios_service { "Total Processes_${fqdn}": - 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, - contacts => $ng_contact_name, - notification_period => '24x7', - service_description => "${fqdn}_total_processes", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0640', - } + @@nagios_service { "Zombie Processes_${fqdn}": + 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, + contacts => $ng_contact_name, + notification_period => '24x7', + service_description => "${fqdn}_zombie_processes", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => 'nagios', + group => 'nagios', + mode => '0640', + } - @@nagios_service { "Zombie Processes_${fqdn}": - 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, - contacts => $ng_contact_name, - notification_period => '24x7', - service_description => "${fqdn}_zombie_processes", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0640', - } - - @@nagios_service { "Current_Load_${fqdn}": - ensure => $ng_load_ensure, - check_command => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}", - use => 'generic-service', - host_name => $fqdn, - contacts => $ng_contact_name, - notification_period => '24x7', - service_description => "${fqdn}_current_load", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0640', - } + @@nagios_service { "Current_Load_${fqdn}": + ensure => $ng_load_ensure, + check_command => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}", + use => 'generic-service', + host_name => $fqdn, + contacts => $ng_contact_name, + notification_period => '24x7', + service_description => "${fqdn}_current_load", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => 'nagios', + group => 'nagios', + mode => '0640', } } } diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index 2dc9577..8be37a8 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -955,6 +955,24 @@ inherited by all classes except defines. +
  • + + ng_enable_target + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    Whether to enable the generation of host and service configuration files for the Nagios server. Default is true.

    +
    + +
    • +
  • ng_contactgroup_members @@ -979,8 +997,6 @@ inherited by all classes except defines. 
     
 
-103
-104
 105
 106
 107
@@ -1150,10 +1166,13 @@ inherited by all classes except defines.
 271
 272
 273
-274
    +274 +275 +276 +277 - 
    # File 'manifests/params.pp', line 103
+        
    # File 'manifests/params.pp', line 105
 
 class confdroid_nagios::params (
 
@@ -1169,6 +1188,7 @@ class confdroid_nagios::params (
   String $ng_status_upd_interval    = '10',
   String $ng_check_ext_commands     = '1',
   String $ng_user                   = 'nagios',
+  Boolean $ng_enable_target         = true,
 
 # contact groups
   String $ng_contactgroup_name       = 'admins',