aha, that was subtle

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index af420ac..6d2bff7 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -106,11 +106,6 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: joerg, bzed
-  gw-man-da2:
-    address: 82.195.75.46
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: joerg, bzed
   gw-marist:
     address: 148.100.96.1
     parents: gw-ubcece
@@ -489,11 +484,6 @@ servers:
     address: 82.195.75.68
     parents: gw-man-da
     hostgroups: computers, buildd, hasbootfs, hassrvfs, squeeze
-  sperger:
-    address: 82.195.75.34
-    parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, squeeze
-    contacts: bzed
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -547,15 +537,15 @@ servers:
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze, buildd, hassrvfs
+    hostgroups: computers, squeeze, buildd, hassrvfs
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze, hassrvfs
+    hostgroups: computers, squeeze, hassrvfs
   piston:
     address: 140.211.15.154
     parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze, hassrvfs
+    hostgroups: computers, squeeze, hassrvfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -665,7 +655,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs, uploadqueue
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
@@ -730,10 +720,6 @@ servers:
     address: 206.12.19.11
     parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
-  vivaldi:
-    address: 206.12.19.12
-    parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -861,7 +847,7 @@ servers:
   beach:
     address: 206.12.19.140
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, apache2-hosts, xinetd-hosts, hassrvfs, apache2-hosts, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, kvmdomains, squeeze, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
@@ -1302,7 +1288,7 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
     hosts: samosa, stabile, sibelius, busoni
-
+  -
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
@@ -1338,16 +1324,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
     hosts: sibelius
-  -
-    name: disk usage on /srv/fossology.debian.net
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
-    hosts: vivaldi
-#  -
-#    name: disk usage on /vicepa
-#    servicegroups: diskspace
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
-#    hostgroups: hasvicepa
   -
     name: disk usage on /var/lib/postgresql/9.0/dak
     servicegroups: diskspace
@@ -2155,11 +2131,11 @@ services:
   #  check: check_tcp!873
   #  hosts: kassia-sec
   #  depends: kassia:process - xinetd
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: merikanto2
-    depends: merikanto:process - xinetd
+#  -
+#    name: network service - rsync
+#    check: check_tcp!873
+#    hosts: merikanto2
+#    depends: merikanto:process - xinetd
 
  ###
   -