summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nagios/files
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-03-09 17:40:11 +0100
committervarac <varacanero@zeromail.org>2016-03-09 17:40:11 +0100
commitbcd6bbeceee3fd4ad2082f46352d9f0813afa9ef (patch)
tree453b34cd26ccf7e56e002d19a39616d481e73bf8 /puppet/modules/site_nagios/files
parent0810e24d7b063c613a482fa04f43be89c6b38fb9 (diff)
parentee4fc33396aa52f9ec797fd431b3027d88fa1aa7 (diff)
Merge branch '2327_dont_recreate_nagios_resources' into develop
Diffstat (limited to 'puppet/modules/site_nagios/files')
-rw-r--r--puppet/modules/site_nagios/files/configs/Debian/nagios.cfg24
1 files changed, 19 insertions, 5 deletions
diff --git a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg
index 981dc12a..695f437b 100644
--- a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg
+++ b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg
@@ -22,18 +22,32 @@ log_file=/var/log/nagios3/nagios.log
# if you wish (as shown below), or keep them all in a single config file.
#cfg_file=/etc/nagios3/commands.cfg
-# Puppet-managed configuration files
-cfg_dir=/etc/nagios3/conf.d
+# Check_mk configuration files
+cfg_dir=/etc/nagios3/conf.d/check_mk
-# check-mk managed configuration files
-cfg_dir=/etc/nagios3/local
+# Puppet-managed configuration files
+cfg_file=/etc/nagios3/nagios_templates.cfg
+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_hostdependency.cfg
+cfg_file=/etc/nagios3/nagios_hostescalation.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_servicegroup.cfg
+cfg_file=/etc/nagios3/nagios_timeperiod.cfg
# Debian also defaults to using the check commands defined by the debian
# nagios-plugins package
cfg_dir=/etc/nagios-plugins/config
-
# OBJECT CACHE FILE
# This option determines where object definitions are cached when
# Nagios starts/restarts. The CGIs read object definitions from