From 461cb526c3e887fa3efdaa0db064843e199a03fc Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 7 Mar 2026 15:41:09 +0100 Subject: [PATCH] Recommit for updates in build 156 --- .../confdroid_nagios_3A_3Aparams.html | 399 +++++++++++++++--- ...nfdroid_nagios_3A_3Aserver_3A_3Afiles.html | 24 +- 2 files changed, 352 insertions(+), 71 deletions(-) diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index 28aa88b..868f952 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -120,7 +120,7 @@ inherited by all classes except defines.
-

confdroid_nagios::params Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)

+

confdroid_nagios::params Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com) @param [String] ng_use_ssl_auth Whether to use SSL authentication in Nagios. Default is ‘0’. @param [String] ng_sysinfo_auth Additional username for the sysinfo authentication in Nagios. Choose a suitable value or leave empty

@@ -589,8 +589,6 @@ inherited by all classes except defines. (String) - (defaults to: 'present') - —
@@ -3137,6 +3135,261 @@ inherited by all classes except defines. +
  • + + ng_context_help + + + (String) + + + (defaults to: '1') + + + — +
    +

    Whether to enable context-sensitive help in Nagios. Default is ‘1’.

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

    Whether to use pending states in Nagios. Default is ‘1’.

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

    Whether to use authentication in Nagios. Default is ‘1’.

    +
    + +
    • + +
  • + + ng_enable_def_user + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    Whether to enable the default user in Nagios. Default is false.

    +
    + +
    • + +
  • + + ng_def_user_name + + + (String) + + + (defaults to: 'ChangeME') + + + — +
    +

    The name of the default user in Nagios. Change to a suitable value.

    +
    + +
    • + +
  • + + ng_confinfo_auth + + + (String) + + + (defaults to: '') + + + — +
    +

    Additional username for the confinfo authentication in Nagios. Choose a suitable value or leave empty

    +
    + +
    • + +
  • + + ng_command_auth + + + (String) + + + (defaults to: '') + + + — +
    +

    Additional username for the command authentication in Nagios. Choose a suitable value or leave empty

    +
    + +
    • + +
  • + + ng_hostview_auth + + + (String) + + + (defaults to: '') + + + — +
    +

    Additional username for the host view authentication in Nagios. Choose a suitable value or leave empty

    +
    + +
    • + +
  • + + ng_serviceview_auth + + + (String) + + + (defaults to: '') + + + — +
    +

    Additional username for the service view authentication in Nagios. Choose a suitable value or leave empty

    +
    + +
    • + +
  • + + ng_host_cmd_auth + + + (String) + + + (defaults to: '') + + + — +
    +

    Additional username for the host command authentication in Nagios. Choose a suitable value or leave empty

    +
    + +
    • + +
  • + + ng_svc_cmd_auth + + + (String) + + + (defaults to: '') + + + — +
    +

    Additional username for the service command authentication in Nagios. Choose a suitable value or leave empty

    +
    + +
    • + +
  • + + ng_readonly_auth + + + (String) + + + (defaults to: '') + + + — +
    +

    Additional username for the read-only authentication in Nagios. Choose a suitable value or leave empty

    +
    + +
    • + +
  • + + ng_use_ssl_auth + + + (String) + + + (defaults to: '0') + + +
    • + +
  • + + ng_sysinfo_auth + + + (String) + + + (defaults to: '') + + +
    • + +
  • + + ng_procs_tot_ensure + + + (String) + + + (defaults to: 'present') + + +
    • + @@ -3148,34 +3401,6 @@ inherited by all classes except defines. 
     
 
-340
-341
-342
-343
-344
-345
-346
-347
-348
-349
-350
-351
-352
-353
-354
-355
-356
-357
-358
-359
-360
-361
-362
-363
-364
-365
-366
-367
 368
 369
 370
@@ -3447,10 +3672,52 @@ inherited by all classes except defines.
 636
 637
 638
-639
    +639 +640 +641 +642 +643 +644 +645 +646 +647 +648 +649 +650 +651 +652 +653 +654 +655 +656 +657 +658 +659 +660 +661 +662 +663 +664 +665 +666 +667 +668 +669 +670 +671 +672 +673 +674 +675 +676 +677 +678 +679 +680 +681 - 
    # File 'manifests/params.pp', line 340
+        
    # File 'manifests/params.pp', line 368
 
 class confdroid_nagios::params (
 
@@ -3603,45 +3870,59 @@ class confdroid_nagios::params (
   String $ng_svc_skip_chk_par_h_d_sts = '-1',
   String $ng_host_skip_chk_dep_status = '-1',
   Boolean $ng_enable_load_ctl_options = false,
-  String $ng_load_ctl_options          = 'jobs_max=100;backoff_limit=10;rampup_change=5',
+  String $ng_load_ctl_options         = 'jobs_max=100;backoff_limit=10;rampup_change=5',
 
 # cgi.cfg
-  String $ng_context_help           = '1',
+  String $ng_context_help             = '1',
+  String $ng_pending_states           = '1',
+  String $ng_use_auth                 = '1',
+  String $ng_use_ssl_auth             = '0',
+  Boolean $ng_enable_def_user         = false,
+  String $ng_def_user_name            = 'ChangeME',
+  String $ng_sysinfo_auth            = '',
+  String $ng_confinfo_auth           = '',
+  String $ng_command_auth            = '',
+  String $ng_hostview_auth           = '',
+  String $ng_serviceview_auth        = '',
+  String $ng_host_cmd_auth           = '',
+  String $ng_svc_cmd_auth            = '',
+  String $ng_readonly_auth           = '' ,
+
 
 # httpd
-  Boolean $ng_use_https             = false,
+  Boolean $ng_use_https               = false,
 
 # check command parameters
 ## ping
-  String $ng_ping_warn               = '100.0,20%',
-  String $ng_ping_crit               = '500.0,60%',
-  String $ng_ping_ensure             = 'present',
+  String $ng_ping_warn                = '100.0,20%',
+  String $ng_ping_crit                = '500.0,60%',
+  String $ng_ping_ensure              = 'present',
 ## disk
-  String $ng_disk_warn               = '20%',
-  String $ng_disk_crit               = '10%' ,
-  String $ng_disk_ensure             = 'present',
+  String $ng_disk_warn                = '20%',
+  String $ng_disk_crit                = '10%' ,
+  String $ng_disk_ensure              = 'present',
 # swap
-  String $ng_swap_warn               = '20',
-  String $ng_swap_crit               = '10',
-  String $ng_swap_ensure             = 'present',
+  String $ng_swap_warn                = '20',
+  String $ng_swap_crit                = '10',
+  String $ng_swap_ensure              = 'present',
 # users
-  String $ng_users_warn              = '20',
-  String $ng_users_crit              = '50',
-  String $ng_users_ensure            = 'present',
+  String $ng_users_warn               = '20',
+  String $ng_users_crit               = '50',
+  String $ng_users_ensure             = 'present',
 #total procs
-  String $ng_procs_tot_warn          = '330',
-  String $ng_procs_tot_crit          = '400',
-  String $ng_procs_tot_param         = 'RDST',
-  String $ng_procs_tot_ens           = 'present',
+  String $ng_procs_tot_warn           = '330',
+  String $ng_procs_tot_crit           = '400',
+  String $ng_procs_tot_param          = 'RDST',
+  String $ng_procs_tot_ensure         = 'present',
 # zombie procs
-  String $ng_procs_z_warn            = '10',
-  String $ng_procs_z_crit            = '30',
-  String $ng_procs_z_param           = 'Z',
-  String $ng_procs_z_ensure          = 'present',
+  String $ng_procs_z_warn             = '10',
+  String $ng_procs_z_crit             = '30',
+  String $ng_procs_z_param            = 'Z',
+  String $ng_procs_z_ensure           = 'present',
 # load
-  String $ng_load_warn               = '5.00,4.00,3.00',
-  String $ng_load_crit               = '10.00,6.00,4.00',
-  String $ng_load_ensure             = 'present',
+  String $ng_load_warn                = '5.00,4.00,3.00',
+  String $ng_load_crit                = '10.00,6.00,4.00',
+  String $ng_load_ensure              = 'present',
 
 # single nagios checks
   Boolean $ng_enable_swap_check       = true,
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
index 6f0b749..731a243 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
@@ -166,18 +166,18 @@ class confdroid_nagios::server::files (
       notify   => Service[$ng_service],
     }
 
-#    file { $ng_cgi_cfg_file:
-#      ensure   => file,
-#      owner    => 'nagios',
-#      group    => 'nagios',
-#      mode     => '0644',
-#      selrange => s0,
-#      selrole  => object_r,
-#      seltype  => nagios_etc_t,
-#      seluser  => system_u,
-#      content  => template($ng_nagios_cgi_cfg_erb),
-#      notify   => Service[$ng_service],
-#    }
+    file { $ng_cgi_cfg_file:
+      ensure   => file,
+      owner    => 'nagios',
+      group    => 'nagios',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_etc_t,
+      seluser  => system_u,
+      content  => template($ng_nagios_cgi_cfg_erb),
+      notify   => Service[$ng_service],
+    }
 
     file { $ng_lock_file:
       ensure   => file,