X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=91e2d683167fab988a1b9d1ad56937bced02320b;hb=67d5661690b284fbd49b57abfea4f13641a94df7;hp=253412cbc74af15f4679146d2c1c824cd2704ede;hpb=c4a7f5276567ee579744eb69da4e9ba0eedc1aed;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 253412c..91e2d68 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -72,11 +72,6 @@ servers:
     address: 194.177.211.193
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-helsinki:
-    address: 128.214.173.25
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: holger
   gw-isc:
     address: 149.20.20.1
     parents: gw-ubcece
@@ -197,7 +192,7 @@ servers:
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
   # }}}
   # {{{ gw-arm
   abel:
@@ -228,10 +223,6 @@ servers:
     address: 217.140.96.66
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, deadslow
-  hartmann:
-    address: 217.140.96.67
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
   hasse:
     address: 217.140.96.68
     parents: gw-arm
@@ -393,12 +384,6 @@ servers:
     parents: gw-ftcollins
     hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
   # }}}
-  # {{{ gw-freenet
-  pergolesi:
-    address: 62.104.23.252
-    parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
-  # }}}
   # {{{ gw-grnet
   barber:
     address: 194.177.211.203
@@ -429,13 +414,6 @@ servers:
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, mptraid, buildd, wheezy
   # }}}
-  # {{{ gw-helsinki
-  piatti:
-    address: 193.167.161.225
-    parents: gw-helsinki
-    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
-    contacts: holger
-  # }}}
   # {{{ gw-isc
   schein:
     address: 149.20.20.6
@@ -583,7 +561,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, apache2-hosts, bind9-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, bind9-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -635,7 +613,7 @@ servers:
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs, apache2-hosts
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -1321,7 +1299,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, piatti
+    hosts: saens
   -
     name: disk usage on /usr
     servicegroups: diskspace