argento → squeeze

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 7ffb684..de34f10 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -56,7 +56,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-mit-csail:
-    address: 128.30.0.254
+    address: 128.31.0.1
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-xs4all:
@@ -216,14 +216,6 @@ 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
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
@@ -249,7 +241,7 @@ servers:
   merulo:
     address: 192.25.206.58
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasusrfs, lenny
+    hostgroups: computers, porterbox, hasusrfs, squeeze, brokensamhain
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
@@ -263,12 +255,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hassrvfs, lenny
+    hostgroups: computers, porterbox, sw-raid, hassrvfs, squeeze
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -355,7 +347,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa, squeeze, apache2-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -417,7 +409,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
     contacts: bzed
 
   widor:
@@ -490,7 +482,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid, lenny
+    hostgroups: computers, buildd, sw-raid, squeeze, brokensamhain
 
   pescetti:
     address: 217.114.76.85
@@ -676,7 +668,11 @@ servers:
   berlioz:
     address: 206.12.19.131
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https
+  gombert:
+    address: 206.12.19.132
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
 
   lebrun:
     address: 193.198.184.10
@@ -813,11 +809,11 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   alain:
     address: 217.140.96.58
     parents: gw-arm
@@ -825,11 +821,11 @@ servers:
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   arne:
     address: 217.140.96.61
     parents: gw-arm
@@ -1147,11 +1143,6 @@ 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 /srv
     servicegroups: diskspace
@@ -1163,11 +1154,6 @@ 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 /tmp
     servicegroups: diskspace
@@ -2413,10 +2399,6 @@ 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 /srv/ftp.debian.org/ftp"