From 95e803f85e46aea97297f128e9cdf90926b3b2aa Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Sun, 1 Mar 2026 17:00:59 +0100 Subject: [PATCH] OP#436 add fqdn --- manifests/nagios/objects/add_contact.pp | 1 + manifests/nagios/objects/add_contactgroups.pp | 1 + manifests/nagios/objects/add_hostgroups.pp | 1 + manifests/nagios/objects/add_servicegroups.pp | 1 + manifests/params.pp | 6 ++++++ 5 files changed, 10 insertions(+) diff --git a/manifests/nagios/objects/add_contact.pp b/manifests/nagios/objects/add_contact.pp index ed6d984..a42a0c8 100644 --- a/manifests/nagios/objects/add_contact.pp +++ b/manifests/nagios/objects/add_contact.pp @@ -28,6 +28,7 @@ define confdroid_nagios::nagios::objects::add_contact ( $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_target_add_contact = $confdroid_nagios::params::ng_target_add_contact $ng_contacts_rule_erb = $confdroid_nagios::params::ng_contacts_rule_erb + $fqdn = $facts['networking']['fqdn'] if $ng_nagios_server == $fqdn { concat::fragment { $name: diff --git a/manifests/nagios/objects/add_contactgroups.pp b/manifests/nagios/objects/add_contactgroups.pp index 5547ad1..f0e2493 100644 --- a/manifests/nagios/objects/add_contactgroups.pp +++ b/manifests/nagios/objects/add_contactgroups.pp @@ -20,6 +20,7 @@ define confdroid_nagios::nagios::objects::add_contactgroups ( $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_tgt_contactgroup_add = $confdroid_nagios::params::ng_tgt_contactgroup_add $ng_cntctgrps_rule_erb = $confdroid_nagios::params::ng_cntctgrps_rule_erb + $fqdn = $facts['networking']['fqdn'] if $ng_nagios_server == $fqdn { concat::fragment { $name: diff --git a/manifests/nagios/objects/add_hostgroups.pp b/manifests/nagios/objects/add_hostgroups.pp index d1560e0..5ec2cda 100644 --- a/manifests/nagios/objects/add_hostgroups.pp +++ b/manifests/nagios/objects/add_hostgroups.pp @@ -22,6 +22,7 @@ define confdroid_nagios::nagios::objects::add_hostgroups ( $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_tgt_hostgroup_add = $confdroid_nagios::params::ng_tgt_hostgroup_add $ng_tgt_hostgrp_rule_erb = $confdroid_nagios::params::ng_tgt_hostgrp_rule_erb + $fqdn = $facts['networking']['fqdn'] if $ng_nagios_server == $fqdn { concat::fragment { $name: diff --git a/manifests/nagios/objects/add_servicegroups.pp b/manifests/nagios/objects/add_servicegroups.pp index 9729688..a668714 100644 --- a/manifests/nagios/objects/add_servicegroups.pp +++ b/manifests/nagios/objects/add_servicegroups.pp @@ -25,6 +25,7 @@ define confdroid_nagios::nagios::objects::add_servicegroups ( $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_tgt_servicegroup_add = $confdroid_nagios::params::ng_tgt_servicegroup_add $ng_tgt_svcgrp_rule_erb = $confdroid_nagios::params::ng_tgt_svcgrp_rule_erb + $fqdn = $facts['networking']['fqdn'] if $ng_nagios_server == $fqdn { concat::fragment { $name: diff --git a/manifests/params.pp b/manifests/params.pp index c3c4215..be63e17 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -97,6 +97,10 @@ # before a host or service is considered down. Default is '10'. # @param [Boolean] ng_enable_swap_check Whether to enable the check_swap # command. Default is true. +# @param [String] ng_status_upd_interval The interval in seconds for Nagios +# to update the status file. Default is '10'. +# @param [String] ng_check_ext_commands Whether to allow external commands +# to be submitted to Nagios. Default is '1'. ############################################################################### class confdroid_nagios::params ( @@ -109,6 +113,8 @@ class confdroid_nagios::params ( 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', # contact groups String $ng_contactgroup_name = 'admins',