From fdaba117fb5b58adb73ba20046dada3cf9247161 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 2 Dec 2009 17:39:46 -0500 Subject: move puppet nagios resources down into conf.d --- files/configs/CentOS/nagios.cfg | 45 ++------------------------------- files/configs/Debian/nagios.cfg | 56 ++++------------------------------------- 2 files changed, 7 insertions(+), 94 deletions(-) (limited to 'files/configs') diff --git a/files/configs/CentOS/nagios.cfg b/files/configs/CentOS/nagios.cfg index f72a344..cddcbf3 100644 --- a/files/configs/CentOS/nagios.cfg +++ b/files/configs/CentOS/nagios.cfg @@ -30,49 +30,8 @@ log_file=/var/log/nagios/nagios.log # This can be very useful if you want to keep command definitions # separate from host and contact definitions... -# all puppet native command paths -cfg_file=/etc/nagios/nagios_command.cfg -cfg_file=/etc/nagios/nagios_contact.cfg -cfg_file=/etc/nagios/nagios_contactgroup.cfg -cfg_file=/etc/nagios/nagios_host.cfg -cfg_file=/etc/nagios/nagios_hostextinfo.cfg -cfg_file=/etc/nagios/nagios_hostgroup.cfg -cfg_file=/etc/nagios/nagios_hostgroupescalation.cfg -cfg_file=/etc/nagios/nagios_service.cfg -cfg_file=/etc/nagios/nagios_servicedependency.cfg -cfg_file=/etc/nagios/nagios_serviceescalation.cfg -cfg_file=/etc/nagios/nagios_serviceextinfo.cfg -cfg_file=/etc/nagios/nagios_timeperdiod.cfg - -# Defaults for CentOS -cfg_dir=/etc/nagios/defaults - -# You can split other types of object definitions across several -# config files if you wish (as done here), or keep them all in a -# single config file. - -#cfg_file=/etc/nagios/contactgroups.cfg -#cfg_file=/etc/nagios/contacts.cfg -#cfg_file=/etc/nagios/dependencies.cfg -#cfg_file=/etc/nagios/escalations.cfg -#cfg_file=/etc/nagios/hostgroups.cfg -#cfg_file=/etc/nagios/hosts.cfg -#cfg_file=/etc/nagios/services.cfg -#cfg_file=/etc/nagios/timeperiods.cfg - -# Extended host/service info definitions are now stored along with -# other object definitions: -#cfg_file=/etc/nagios/hostextinfo.cfg -#cfg_file=/etc/nagios/serviceextinfo.cfg - -# You can also tell Nagios to process all config files (with a .cfg -# extension) in a particular directory by using the cfg_dir -# directive as shown below: - -#cfg_dir=/etc/nagios/servers -#cfg_dir=/etc/nagios/printers -#cfg_dir=/etc/nagios/switches -#cfg_dir=/etc/nagios/routers +# Puppet-managed configuration files +cfg_dir=/etc/nagios3/conf.d diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg index 46be0d7..377da6b 100644 --- a/files/configs/Debian/nagios.cfg +++ b/files/configs/Debian/nagios.cfg @@ -13,17 +13,7 @@ log_file=/var/log/nagios3/nagios.log -# Commands definitions -#cfg_file=/etc/nagios3/commands.cfg -# Debian also defaults to using the check commands defined by the debian -# nagios-plugins package -cfg_dir=/etc/nagios-plugins/config - -# Debian uses by default a configuration directory where nagios3-common, -# other packages and the local admin can dump or link configuration -# files into. -#cfg_dir=/etc/nagios3/conf.d # OBJECT CONFIGURATION FILE(S) # These are the object configuration files in which you define hosts, @@ -31,48 +21,12 @@ cfg_dir=/etc/nagios-plugins/config # You can split your object definitions across several config files # if you wish (as shown below), or keep them all in a single config file. -# all puppet native command paths -cfg_file=/etc/nagios3/nagios_command.cfg -cfg_file=/etc/nagios3/nagios_contact.cfg -cfg_file=/etc/nagios3/nagios_contactgroup.cfg -cfg_file=/etc/nagios3/nagios_host.cfg -cfg_file=/etc/nagios3/nagios_hostextinfo.cfg -cfg_file=/etc/nagios3/nagios_hostgroup.cfg -cfg_file=/etc/nagios3/nagios_hostgroupescalation.cfg -cfg_file=/etc/nagios3/nagios_service.cfg -cfg_file=/etc/nagios3/nagios_servicedependency.cfg -cfg_file=/etc/nagios3/nagios_serviceescalation.cfg -cfg_file=/etc/nagios3/nagios_serviceextinfo.cfg -cfg_file=/etc/nagios3/nagios_timeperdiod.cfg - -# Defaults for Debian -cfg_dir=/etc/nagios3/defaults - -# You can specify individual object config files as shown below: -#cfg_file=/etc/nagios3/objects/commands.cfg -#cfg_file=/etc/nagios3/objects/contacts.cfg -#cfg_file=/etc/nagios3/objects/timeperiods.cfg -#cfg_file=/etc/nagios3/objects/templates.cfg - -# Definitions for monitoring a Windows machine -#cfg_file=/etc/nagios3/objects/windows.cfg - -# Definitions for monitoring a router/switch -#cfg_file=/etc/nagios3/objects/switch.cfg - -# Definitions for monitoring a network printer -#cfg_file=/etc/nagios3/objects/printer.cfg - - -# You can also tell Nagios to process all config files (with a .cfg -# extension) in a particular directory by using the cfg_dir -# directive as shown below: - -#cfg_dir=/etc/nagios3/servers -#cfg_dir=/etc/nagios3/printers -#cfg_dir=/etc/nagios3/switches -#cfg_dir=/etc/nagios3/routers +# Puppet-managed configuration files +cfg_dir=/etc/nagios3/conf.d +# Debian also defaults to using the check commands defined by the debian +# nagios-plugins package +cfg_dir=/etc/nagios-plugins/config -- cgit v1.2.3