remove spohr, ftcollins-gw

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 28cc4b3..23796b2 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -74,10 +74,6 @@ servers:
     address: 62.104.23.249
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-ftcollins:
-    address: 192.25.206.1
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-gatech:
     address: 128.61.240.1
     parents: gw-ubcece
@@ -481,20 +477,6 @@ servers:
     parents: gw-dgi
     hostgroups: computers, acpid-hosts, wheezy, dl380, nfs-client, hassrvfs
   # }}}
-  # {{{ gw-ftcollins
-  #alkman:
-  #  address: 192.25.206.63
-  #  parents: gw-ftcollins
-  #  hostgroups: computers, buildd, acpid-hosts, wheezy
-  #mundy:
-  #  address: 192.25.206.62
-  #  parents: gw-ftcollins
-  #  hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, wheezy
-  spohr:
-    address: 192.25.206.33
-    parents: gw-ftcollins
-    hostgroups: computers, service, dl380, apache2-hosts, wheezy, no-bacula
-  # }}}
   # {{{ gw-gatech
   sechter:
     address: 128.61.240.73
@@ -1329,12 +1311,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
     hostgroups: computers
-    excludehosts: spohr
-  -
-    name: disk usage on /
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace