summaryrefslogtreecommitdiff
path: root/files/configs/Debian/nagios.cfg
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-12-09 19:32:51 +0000
committerMicah <micah@riseup.net>2015-12-09 19:32:51 +0000
commitd1321c39001ebd445b37fd551fbfd324b6ab6ae0 (patch)
tree6c3a56aac66bf1cdce128d89550151a11cdb21c2 /files/configs/Debian/nagios.cfg
parent993b624bd14dc5ef88847b11abc06d2b708c23b6 (diff)
parent6cd3270ccfd806bcc8097be4f6982c6dccc6a4aa (diff)
Merge branch 'immerda_changes' into 'master'
Merge in immerda changes - purging of resources and lots of nice additional checks Sorry for the big amount of changes, but I think I merged everything nicely with what we have been working. Ok, so what do you get here: * Purging of unmanaged resources, for that I had to move everything to the default paths of the puppet types, BUT now as soon as a node won't export anymore a resource it will get purged from nagios. No more cleaning up of decomissioned nodes, just remove them from puppet (puppet node clean oldnode.example.com) and they will also disappear from nagios. * slight changes to the http checks. ** naming the checks consistently, so it's easier to change what they are looking for. ** Also accept 301 & 302 as a good value per default. ** make it possible to define accepted return codes per http & https * add gpgkey checks, so you won't miss any expiring gpg keys anymore * add imap login checks, so you can check whether ppl can actually login to your mailserver * add horde login checks, so you can check whether login to horde still works * linting wherever I touched something. See merge request !15
Diffstat (limited to 'files/configs/Debian/nagios.cfg')
-rw-r--r--files/configs/Debian/nagios.cfg17
1 files changed, 16 insertions, 1 deletions
diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg
index 41a2e3c..1dcef4a 100644
--- a/files/configs/Debian/nagios.cfg
+++ b/files/configs/Debian/nagios.cfg
@@ -23,7 +23,22 @@ log_file=/var/log/nagios3/nagios.log
cfg_file=/etc/nagios3/commands.cfg
# Puppet-managed configuration files
-cfg_dir=/etc/nagios3/conf.d
+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