From: Martin Zobel-Helas Date: Thu, 31 Dec 2009 15:59:46 +0000 (+0100) Subject: Revert "raff out of nagios" X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=c2a878235a4f582630f546692dae6025c28dc0de;p=mirror%2Fdsa-nagios.git Revert "raff out of nagios" This reverts commit 14eda25254f3c4ab12c2f25095e1d447bcbba6ad. --- diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 0db60c8..23668ec 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -179,10 +179,10 @@ servers: address: 192.25.206.57 parents: spohr hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts, bind9-hosts -# raff: -# address: 192.25.206.59 -# parents: spohr -# hostgroups: computers, no-udev, service, dl380, apache2-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, hasvarfs, hasusrfs, hasorgfs + raff: + address: 192.25.206.59 + parents: spohr + hostgroups: computers, no-udev, service, dl380, apache2-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, hasvarfs, hasusrfs, hasorgfs merkel: address: 192.25.206.16 parents: spohr @@ -893,7 +893,7 @@ services: name: disk usage on /tmp servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp" - hosts: saens, puccini, merkel, tartini, powell, piatti, escher + hosts: raff, saens, puccini, merkel, tartini, powell, piatti, escher - name: disk usage on /usr servicegroups: diskspace @@ -1642,7 +1642,7 @@ services: depends: kassia:process - apache2 - master hosts: kassia-sec, kassia-ftp, kassia-volatile - # keyserver on kaufmann + # keyserver on raff - name: network service - http keyserver check: dsa_check_http_port!11371 @@ -1881,7 +1881,7 @@ services: - name: nfs mount ftp archive nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp" - hosts: merkel + hosts: merkel, raff - name: nfs mount ftp archive nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"