From 6693ff82823a2defd765006826903143b2657524 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 7 Mar 2026 13:28:18 +0100 Subject: [PATCH] Recommit for updates in build 152 --- .../confdroid_nagios_3A_3Aparams.html | 744 ++++++++++++++---- 1 file changed, 604 insertions(+), 140 deletions(-) diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index f818c65..0a23183 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -1909,6 +1909,420 @@ inherited by all classes except defines. —

The retention contact service attribute mask for Nagios. Default is ‘0’.

+
+ + + +
  • + + ng_interval_length + + + (String) + + + (defaults to: '60') + + + — +
    +

    The interval length for Nagios. Default is ‘60’.

    +
    + +
    • + +
  • + + ng_check_for_updates + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to check for updates in Nagios. Default is ‘1’.

    +
    + +
    • + +
  • + + ng_bare_update_check + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to perform a bare update check in Nagios. Default is ‘1’.

    +
    + +
    • + +
  • + + ng_use_aggr_host_checking + + + (String) + + + (defaults to: '0') + + + — +
    +

    Whether to use aggressive host checking in Nagios. Default is ‘0’.

    +
    + +
    • + +
  • + + ng_execute_service_checks + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to execute service checks in Nagios at initial start. Default is ‘1’.

    +
    + +
    • + +
  • + + ng_accept_pass_svc_checks + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to accept passive service checks in Nagios. Default is ‘1’.

    +
    + +
    • + +
  • + + ng_execute_host_checks + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to execute host checks in Nagios at initial start. Default is ‘1’.

    +
    + +
    • + +
  • + + ng_accept_pass_host_checks + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to accept passive host checks in Nagios. Default is ‘1’.

    +
    + +
    • + +
  • + + ng_enable_notifications + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to enable notifications in Nagios when it is initially started. Default is ‘1’.

    +
    + +
    • + +
  • + + ng_enable_event_handlers + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to enable event handlers in Nagios when it is initially started. Default is ‘1’.

    +
    + +
    • + +
  • + + ng_process_perf_data + + + (String) + + + (defaults to: '0') + + + — +
    +

    Whether to process performance data in Nagios when it is initially started. Default is ‘0’.

    +
    + +
    • + +
  • + + ng_host_perfdata_command + + + (String) + + + (defaults to: 'process-host-perfdata') + + + — +
    +

    The command to process host performance data in Nagios. Default is ‘process-host-perfdata’.

    +
    + +
    • + +
  • + + ng_svc_perfdata_command + + + (String) + + + (defaults to: 'process-service-perfdata') + + + — +
    +

    The command to process service performance data in Nagios. Default is ‘process-service-perfdata’.

    +
    + +
    • + +
  • + + ng_host_perfdata_template + + + (String) + + + (defaults to: '[HOSTPERFDATA]\t$TIMET$\t$HOSTNAME$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$') + + + — +
    +

    The template for host performance data in Nagios.

    +
    + +
    • + +
  • + + ng_svc_perfdata_template + + + (String) + + + (defaults to: '[SERVICEPERFDATA]\t$TIMET$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICEEXECUTIONTIME$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$') + + + — +
    +

    The template for service performance data in Nagios.

    +
    + +
    • + +
  • + + ng_host_perfdata_file_mode + + + (String) + + + (defaults to: 'a') + + + — +
    +

    The file mode for host performance data in Nagios. Default is ‘a’.

    +
    + +
    • + +
  • + + ng_svc_perfdata_file_mode + + + (String) + + + (defaults to: 'a') + + + — +
    +

    The file mode for service performance data in Nagios. Default is ‘a’.

    +
    + +
    • + +
  • + + ng_h_perfdata_proc_intval + + + (String) + + + (defaults to: '0') + + + — +
    +

    The interval for processing host performance data in Nagios. Default is ‘0’.

    +
    + +
    • + +
  • + + ng_s_perfdata_proc_intval + + + (String) + + + (defaults to: '0') + + + — +
    +

    The interval for processing service performance data in Nagios. Default is ‘0’.

    +
    + +
    • + +
  • + + ng_h_perfdata_proc_cmd + + + (String) + + + (defaults to: 'process-host-perfdata') + + + — +
    +

    The command to process host performance data in Nagios. Default is ‘process-host-perfdata’.

    +
    + +
    • + +
  • + + ng_s_perfdata_proc_cmd + + + (String) + + + (defaults to: 'process-service-perfdata') + + + — +
    +

    The command to process service performance data in Nagios. Default is ‘process-service-perfdata’.

    +
    + +
    • + +
  • + + ng_h_perfdata_proc_e_result + + + (String) + + + (defaults to: '0') + + + — +
    +

    The expected result for processing host performance data in Nagios. Default is ‘0’.

    +
    + +
    • + +
  • + + ng_s_perfdata_proc_e_result + + + (String) + + + (defaults to: '0') + + + — +
    +

    The expected result for processing service performance data in Nagios. Default is ‘0’.

    • @@ -1924,52 +2338,6 @@ inherited by all classes except defines. 
     
 
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
-246
-247
-248
-249
-250
-251
-252
 253
 254
 255
@@ -2152,95 +2520,189 @@ inherited by all classes except defines.
 432
 433
 434
-435
    +435 +436 +437 +438 +439 +440 +441 +442 +443 +444 +445 +446 +447 +448 +449 +450 +451 +452 +453 +454 +455 +456 +457 +458 +459 +460 +461 +462 +463 +464 +465 +466 +467 +468 +469 +470 +471 +472 +473 +474 +475 +476 +477 +478 +479 +480 +481 +482 +483 +484 +485 +486 +487 +488 +489 +490 +491 +492 +493 +494 +495 +496 +497 +498 +499 +500 +501 +502 +503 +504 +505 +506 - 
    # File 'manifests/params.pp', line 207
+        
    # File 'manifests/params.pp', line 253
 
 class confdroid_nagios::params (
 
 # main
-  String $ng_nagios_server           = 'nagios.example.net',
-  Array $ng_reqpackages_server       = ['nagios','nagios-devel'],
-  Array $ng_reqpackages_client       = ['net-snmp-utils','nagios-plugins','nagios-plugins-all','nagios-plugins-nrpe','nagios-common'],
-  String $ng_pkg_ensure              = 'present',
-  Boolean $ng_include_nrpe           = true,
-  String $ng_main_user               = 'nagios',
-  String $ng_main_password           = 'nagios',
-  String $ng_max_check_attempts      = '10',
-  String $ng_status_upd_interval     = '10',
-  String $ng_check_ext_commands      = '1',
-  String $ng_user                    = 'nagios',
-  Boolean $ng_enable_target          = true,
-  Boolean $ng_purge_target           = true,
+  String $ng_nagios_server            = 'nagios.example.net',
+  Array $ng_reqpackages_server        = ['nagios','nagios-devel'],
+  Array $ng_reqpackages_client        = ['net-snmp-utils','nagios-plugins','nagios-plugins-all','nagios-plugins-nrpe','nagios-common'],
+  String $ng_pkg_ensure               = 'present',
+  Boolean $ng_include_nrpe            = true,
+  String $ng_main_user                = 'nagios',
+  String $ng_main_password            = 'nagios',
+  String $ng_max_check_attempts       = '10',
+  String $ng_status_upd_interval      = '10',
+  String $ng_check_ext_commands       = '1',
+  String $ng_user                     = 'nagios',
+  Boolean $ng_enable_target           = true,
+  Boolean $ng_purge_target            = true,
 
 # contact groups
-  String $ng_contactgroup_name       = 'admins',
-  String $ng_contactgroup_alias      = 'Nagios Administrators',
-  String $ng_contactgroup_members    = 'nagiosadmin',
+  String $ng_contactgroup_name        = 'admins',
+  String $ng_contactgroup_alias       = 'Nagios Administrators',
+  String $ng_contactgroup_members     = 'nagiosadmin',
 
 # contacts
-  String $ng_contact_name            = 'nagiosadmin',
-  String $ng_contact_alias           = 'Nagios Admin',
-  String $ng_contact_groups          = 'admins',
-  String $ng_contact_email           = 'nagiosadmin@example.net',
+  String $ng_contact_name             = 'nagiosadmin',
+  String $ng_contact_alias            = 'Nagios Admin',
+  String $ng_contact_groups           = 'admins',
+  String $ng_contact_email            = 'nagiosadmin@example.net',
 
 # hostgroups
-  String $ng_hostgroup_name          = 'linux-servers',
-  String $ng_hostgroup_alias         = 'Linux Servers',
+  String $ng_hostgroup_name           = 'linux-servers',
+  String $ng_hostgroup_alias          = 'Linux Servers',
 
 # nagios.cfg
-  String $ng_log_file                = '/var/log/nagios/nagios.log',
-  String $ng_event_broker_options    = '-1',
-  Boolean $ng_enable_query_handler   = false,
-  Array $ng_event_broker_module      = [],
-  String $ng_log_rotation_method     = 'd',
-  String $ng_use_syslog              = '1',
-  String $ng_log_notifications       = '1',
-  String $ng_log_service_retries     = '1',
-  String $ng_log_host_retries        = '1',
-  String $ng_log_event_handlers      = '1',
-  String $ng_log_initial_states      = '0',
-  String $ng_log_current_states      = '1',
-  String $ng_log_external_commands   = '1',
-  String $ng_log_passive_checks      = '1',
-  Array $ng_glob_host_evt_handler    = [],
-  Array $ng_glob_svc_evt_handler     = [],
-  String $ng_svc_int_check_delay     = 's',
-  String $ng_max_svc_check_spread    = '30',
-  String $ng_svc_interleave_factor   = 's',
-  String $ng_host_int_check_delay    = 's',
-  String $ng_max_host_check_spread   = '30',
-  String $ng_max_concurrent_checks   = '0',
-  String $ng_check_res_reaper_freq   = '10',
-  String $ng_max_check_res_reap_time = '30',
-  String $ng_max_check_res_file_age  = '3600',
-  String $ng_cached_h_check_horizon  = '15',
-  String $ng_cached_s_check_horizon  = '15',
-  String $ng_pred_host_dep_checks    = '1',
-  String $ng_pred_svc_dep_checks     = '1',
-  String $ng_soft_state_dependencies = '0',
-  String $ng_time_change_threshold   = '900',
-  String $ng_auto_reschedule_checks  = '1',
-  String $ng_auto_reschedule_intval  = '30',
-  String $ng_auto_reschedule_window  = '180',
-  String $ng_service_check_timeout   = '60',
-  String $ng_host_check_timeout      = '30',
-  String $ng_event_handler_timeout   = '30',
-  String $ng_notification_timeout    = '30',
-  String $ng_ocsp_timeout            = '5',
-  String $ng_ochp_timeout            = '5',
-  String $ng_perfdata_timeout        = '5',
-  String $ng_retain_state_inf        = '1',
-  String $ng_retention_update_intval = '60',
-  String $ng_use_ret_program_state   = '1',
-  String $ng_use_ret_scheduling_info = '1',
-  String $ng_ret_host_attr_mask      = '0',
-  String $ng_ret_service_attr_mask   = '0',
-  String $ng_ret_proc_host_attr_mask = '0',
-  String $ng_ret_proc_svc_attr_mask  = '0',
-  String $ng_ret_contact_h_attr_mask = '0',
-  String $ng_ret_contact_s_attr_mask = '0',
+  String $ng_log_file                 = '/var/log/nagios/nagios.log',
+  String $ng_event_broker_options     = '-1',
+  Boolean $ng_enable_query_handler    = false,
+  Array $ng_event_broker_module       = [],
+  String $ng_log_rotation_method      = 'd',
+  String $ng_use_syslog               = '1',
+  String $ng_log_notifications        = '1',
+  String $ng_log_service_retries      = '1',
+  String $ng_log_host_retries         = '1',
+  String $ng_log_event_handlers       = '1',
+  String $ng_log_initial_states       = '0',
+  String $ng_log_current_states       = '1',
+  String $ng_log_external_commands    = '1',
+  String $ng_log_passive_checks       = '1',
+  Array $ng_glob_host_evt_handler     = [],
+  Array $ng_glob_svc_evt_handler      = [],
+  String $ng_svc_int_check_delay      = 's',
+  String $ng_max_svc_check_spread     = '30',
+  String $ng_svc_interleave_factor    = 's',
+  String $ng_host_int_check_delay     = 's',
+  String $ng_max_host_check_spread    = '30',
+  String $ng_max_concurrent_checks    = '0',
+  String $ng_check_res_reaper_freq    = '10',
+  String $ng_max_check_res_reap_time  = '30',
+  String $ng_max_check_res_file_age   = '3600',
+  String $ng_cached_h_check_horizon   = '15',
+  String $ng_cached_s_check_horizon   = '15',
+  String $ng_pred_host_dep_checks     = '1',
+  String $ng_pred_svc_dep_checks      = '1',
+  String $ng_soft_state_dependencies  = '0',
+  String $ng_time_change_threshold    = '900',
+  String $ng_auto_reschedule_checks   = '1',
+  String $ng_auto_reschedule_intval   = '30',
+  String $ng_auto_reschedule_window   = '180',
+  String $ng_service_check_timeout    = '60',
+  String $ng_host_check_timeout       = '30',
+  String $ng_event_handler_timeout    = '30',
+  String $ng_notification_timeout     = '30',
+  String $ng_ocsp_timeout             = '5',
+  String $ng_ochp_timeout             = '5',
+  String $ng_perfdata_timeout         = '5',
+  String $ng_retain_state_inf         = '1',
+  String $ng_retention_update_intval  = '60',
+  String $ng_use_ret_program_state    = '1',
+  String $ng_use_ret_scheduling_info  = '1',
+  String $ng_ret_host_attr_mask       = '0',
+  String $ng_ret_service_attr_mask    = '0',
+  String $ng_ret_proc_host_attr_mask  = '0',
+  String $ng_ret_proc_svc_attr_mask   = '0',
+  String $ng_ret_contact_h_attr_mask  = '0',
+  String $ng_ret_contact_s_attr_mask  = '0',
+  String $ng_interval_length          = '60',
+  String $ng_check_for_updates        = '1',
+  String $ng_bare_update_check        = '1',
+  String $ng_use_aggr_host_checking   = '0',
+  String $ng_execute_service_checks   = '1',
+  String $ng_accept_pass_svc_checks   = '1',
+  String $ng_execute_host_checks      = '1',
+  String $ng_accept_pass_host_checks  = '1',
+  String $ng_enable_notifications     = '1',
+  String $ng_enable_event_handlers    = '1',
+  String $ng_process_perf_data        = '0',
+  String $ng_host_perfdata_command    = 'process-host-perfdata',
+  String $ng_svc_perfdata_command     = 'process-service-perfdata',
+  String $ng_host_perfdata_template   = '[HOSTPERFDATA]\t$TIMET$\t$HOSTNAME$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$',
+  String $ng_svc_perfdata_template    = '[SERVICEPERFDATA]\t$TIMET$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICEEXECUTIONTIME$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$',
+  String $ng_host_perfdata_file_mode  = 'a',
+  String $ng_svc_perfdata_file_mode   = 'a',
+  String $ng_h_perfdata_proc_intval   = '0',
+  String $ng_s_perfdata_proc_intval   = '0',
+  String $ng_h_perfdata_proc_cmd      = 'process-host-perfdata',
+  String $ng_s_perfdata_proc_cmd      = 'process-service-perfdata',
+  String $ng_h_perfdata_proc_e_result = '0',
+  String $ng_s_perfdata_proc_e_result = '0',
 
 # cgi.cfg
   String $ng_context_help           = '1',
@@ -2361,27 +2823,29 @@ class confdroid_nagios::params (
   $ng_temp_file               = "${ng_spool_dir}/nagios.tmp"
   $ng_check_result_path       = "${ng_spool_dir}/checkresults"
   $ng_state_retention_file    = "${ng_spool_dir}/retention.dat"
+  $ng_host_perfdata_file      = "${ng_log_dir}/host-perfdata"
+  $ng_svc_perfdata_file       = "${ng_log_dir}/service-perfdata"
 
 ## old
-  $ng_taccgi_erb              = 'confdroid_nagios/selinux/taccgi.erb'
-  $ng_statcgi_erb             = 'confdroid_nagios/selinux/statuscgi.erb'
-  $ng_statdat_erb             = 'confdroid_nagios/selinux/statusdat.erb'
-  $ng_checknrpe_erb           = 'confdroid_nagios/selinux/checknrpe.erb'
-  $ng_checknagios_erb         = 'confdroid_nagios/selinux/checknagios.erb'
-  $ng_nagios_conf             = '/etc/httpd/conf.d/nagios.conf'
-  $ng_nagios_conf_erb         = 'confdroid_nagios/httpd/nagios_conf.erb'
-  $ng_welcome_conf            = '/etc/httpd/conf.d/welcome.conf'
-  $ng_welcome_conf_erb        = 'confdroid_nagios/httpd/welcome_conf.erb'
-  $ng_forward_conf            = '/etc/httpd/conf.d/nagios_forward.conf'
-  $ng_forward_conf_erb        = 'confdroid_nagios/httpd/forward_conf.erb'
-  $ng_get_cert_erb            = 'confdroid_nagios/certbot/get_cert.erb'
-  $ng_unless_get_cert         = 'confdroid_nagios/certbot/unless_get_cert.erb'
-  $ng_unless_renew_erb        = 'confdroid_nagios/certbot/unless_renew_cert.erb'
-  $ng_index_html_file         = '/var/www/html/index.html'
-  $ng_index_html_erb          = 'confdroid_nagios/httpd/index_html.erb'
-  $ng_ssl_vhost_file          = '/etc/httpd/conf.d/nagios_ssl.conf'
-  $ng_ssl_vhost_erb           = 'confdroid_nagios/httpd/nagios_ssl_vhost.erb'
-  $ng_grep_erb                = 'confdroid_nagios/selinux/grep.erb'
+#  $ng_taccgi_erb              = 'confdroid_nagios/selinux/taccgi.erb'
+#  $ng_statcgi_erb             = 'confdroid_nagios/selinux/statuscgi.erb'
+#  $ng_statdat_erb             = 'confdroid_nagios/selinux/statusdat.erb'
+#  $ng_checknrpe_erb           = 'confdroid_nagios/selinux/checknrpe.erb'
+#  $ng_checknagios_erb         = 'confdroid_nagios/selinux/checknagios.erb'
+#  $ng_nagios_conf             = '/etc/httpd/conf.d/nagios.conf'
+#  $ng_nagios_conf_erb         = 'confdroid_nagios/httpd/nagios_conf.erb'
+#  $ng_welcome_conf            = '/etc/httpd/conf.d/welcome.conf'
+#  $ng_welcome_conf_erb        = 'confdroid_nagios/httpd/welcome_conf.erb'
+#  $ng_forward_conf            = '/etc/httpd/conf.d/nagios_forward.conf'
+#  $ng_forward_conf_erb        = 'confdroid_nagios/httpd/forward_conf.erb'
+#  $ng_get_cert_erb            = 'confdroid_nagios/certbot/get_cert.erb'
+#  $ng_unless_get_cert         = 'confdroid_nagios/certbot/unless_get_cert.erb'
+#  $ng_unless_renew_erb        = 'confdroid_nagios/certbot/unless_renew_cert.erb'
+#  $ng_index_html_file         = '/var/www/html/index.html'
+#  $ng_index_html_erb          = 'confdroid_nagios/httpd/index_html.erb'
+#  $ng_ssl_vhost_file          = '/etc/httpd/conf.d/nagios_ssl.conf'
+#  $ng_ssl_vhost_erb           = 'confdroid_nagios/httpd/nagios_ssl_vhost.erb'
+#  $ng_grep_erb                = 'confdroid_nagios/selinux/grep.erb'
 
 # includes must be last
   include confdroid_nagios::main::config