no more merkel

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3b5132b..3035719 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -195,14 +195,14 @@ servers:
     address: 192.25.206.59
     parents: gw-HP-ftc
     hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
-  merkel:
-    address: 192.25.206.16
-    parents: gw-HP-ftc
-    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, xinetd-hosts, lenny
-  merkel2:
-    address: 192.25.206.71
-    parents: merkel
-    hostgroups: secondary-IPs
+#  merkel:
+#    address: 192.25.206.16
+#    parents: gw-HP-ftc
+#    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, xinetd-hosts, lenny
+#  merkel2:
+#    address: 192.25.206.71
+#    parents: merkel
+#    hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
@@ -1092,11 +1092,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
     hostgroups: hasorgfs
-  -
-    name: disk usage on /org
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-    hosts: merkel
+#  -
+#    name: disk usage on /org
+#    servicegroups: diskspace
+#    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
+#    hosts: merkel
   -
     name: disk usage on /srv
     servicegroups: diskspace
@@ -1108,16 +1108,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
     hosts: ries
-  -
-    name: disk usage on /org/scratch
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
-    hosts: merkel
+#  -
+#    name: disk usage on /org/scratch
+#    servicegroups: diskspace
+#    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
+#    hosts: merkel
   -
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, merkel, tartini, powell, piatti
+    hosts: saens, tartini, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1480,7 +1480,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts, mail-relay
-    excludehosts: master, busoni, merkel, quantz
+    excludehosts: master, busoni, quantz
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
@@ -1490,11 +1490,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, merkel, quantz
+    excludehosts: master, busoni, quantz
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, busoni, merkel, quantz
+    hosts: master, busoni, quantz
   -
     name: mail queue
     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
@@ -2300,10 +2300,10 @@ services:
     hostgroups: nfs-server
  # see if the nfs stuff works and doesn't hang.
   # the df check all script will also hang, but we don't appear to pay attention to that
-  -
-    name: nfs mount ftp archive
-    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
-    hosts: merkel
+#  -
+#    name: nfs mount ftp archive
+#    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
+#    hosts: merkel
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"