From: Martin Zobel-Helas Date: Thu, 27 Jan 2011 08:56:56 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=829d64b47c297462e237f218f7c05d0401f0e25e;hp=6d841c284c7356ee7870424c629e3658aaf0bec9;p=mirror%2Fdsa-nagios.git Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios * 'master' of git+ssh://db.debian.org/git/dsa-nagios: englund has apache now and xinetd on sibelius Make the check work with Ubuntu's kernel names (Alexander Reichle-Schmehl) (c) years Fix --ignore-transfer-speed logic Group ../debian/changelog better sibelius is now an rsyncd host Do not do cpqarrayd checks on squeeze Do not require the set of excludes to be a subset of the included hosts Do apt checks on squeeze now update hostgroups for raff Change disk usage thresholds for /vicepa from 80/90 to 90/95 --- diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 5a5a616..b23986b 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -547,7 +547,7 @@ servers: stabile: address: 206.12.19.13 parents: gw-ubc - hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, ftpd-hosts + hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server paganini: address: 206.12.19.10 parents: tchaikovsky