diff --git a/manifests/nagios/objects/add_contactgroups_rules.pp b/manifests/nagios/objects/add_contactgroups_rules.pp index 91f038e..f1947c6 100644 --- a/manifests/nagios/objects/add_contactgroups_rules.pp +++ b/manifests/nagios/objects/add_contactgroups_rules.pp @@ -19,14 +19,14 @@ class confdroid_nagios::nagios::objects::add_contactgroups_rules ( concat { $ng_tgt_contactgroup_add: ensure => present, path => $ng_tgt_contactgroup_add, - owner => $ng_user, - group => $ng_user, + owner => 'nagios', + group => 'nagios', mode => '0640', selrange => s0, selrole => object_r, seltype => nagios_etc_t, seluser => system_u, - notify => Service[$ng_service], + notify => Service[$ng_nagios_service], } # manage file header diff --git a/manifests/params.pp b/manifests/params.pp index 8134bce..a0ad36f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -27,6 +27,52 @@ # Nagios web interface. Default is '1'. # @param [String] ng_log_file The path to the Nagios log file. Default is # '/var/log/nagios/nagios.log'. +# @param [String] ng_ping_warn The warning threshold for the check_ping +# command. Default is '100.0,20%'. +# @param [String] ng_ping_crit The critical threshold for the check_ping +# command. Default is '500.0,60%'. +# @param [String] ng_ping_ensure The ensure value for the check_ping command. +# Default is 'present'. +# @param [String] ng_disk_warn The warning threshold for the check_disk +# command. Default is '20%'. +# @param [String] ng_disk_crit The critical threshold for the check_disk +# command. Default is '10%'. +# @param [String] ng_disk_ensure The ensure value for the check_disk command. +# Default is 'present'. +# @param [String] ng_swap_warn The warning threshold for the check_swap +# command. Default is '20'. +# @param [String] ng_swap_crit The critical threshold for the check_swap +# command. Default is '10'. +# @param [String] ng_swap_ensure The ensure value for the check_swap command. +# Default is 'present'. +# @param [String] ng_users_warn The warning threshold for the check_users +# command. Default is '20'. +# @param [String] ng_users_crit The critical threshold for the check_users +# command. Default is '50'. +# @param [String] ng_users_ensure The ensure value for the check_users command. +# Default is 'present'. +# @param [String] ng_procs_tot_warn The warning threshold for the check_procs +# command with total processes. Default is '330'. +# @param [String] ng_procs_tot_crit The critical threshold for the check_procs +# command with total processes. Default is '400'. +# @param [String] ng_procs_tot_param The parameters for the check_procs command +# with total processes. Default is 'RDST'. +# @param [String] ng_procs_tot_ensure The ensure value for the check_procs +# command with total processes. Default is 'present'. +# @param [String] ng_procs_z_warn The warning threshold for the check_procs +# command with zombie processes. Default is '10'. +# @param [String] ng_procs_z_crit The critical threshold for the check_procs +# command with zombie processes. Default is '30'. +# @param [String] ng_procs_z_param The parameters for the check_procs command +# with zombie processes. Default is 'Z'. +# @param [String] ng_procs_z_ensure The ensure value for the check_procs command +# with zombie processes. Default is 'present'. +# @param [String] ng_load_warn The warning threshold for the check_load command. +# Default is '5.00,4.00,3.00'. +# @param [String] ng_load_crit The critical threshold for the check_load command. +# Default is '10.00,6.00,4.00'. +# @param [String] ng_load_ensure The ensure value for the check_load command. +# Default is 'present'. ############################################################################### class confdroid_nagios::params ( @@ -80,7 +126,6 @@ class confdroid_nagios::params ( String $ng_load_crit = '10.00,6.00,4.00', String $ng_load_ensure = 'present', - ) { # Default facts $fqdn = $facts['networking']['fqdn']