X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f55b0738817f46c016fc47b53e5fd2cf92720f53;hb=12bb66acd96638a1fd196565a9f34503b2095842;hp=a25b5da1a789cdce45e837d14fca1975af41e93e;hpb=09770fd5c3e8aebef2885eb685a56d464136ee5d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a25b5da..f55b073 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -213,7 +213,7 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, deadslow
   alain:
     address: 217.140.96.58
     parents: gw-arm
@@ -261,7 +261,7 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, squeeze
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
   ries:
     address: 138.16.160.9
     parents: gw-brown
@@ -355,11 +355,11 @@ servers:
   sompek:
     address: 217.196.149.225
     parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
   stadler:
     address: 217.196.149.226
     parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
   # }}}
   # {{{ gw-csail
   senfl:
@@ -381,11 +381,11 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-ftcollins
-    hostgroups: computers, buildd, acpid-hosts, squeeze
+    hostgroups: computers, buildd, acpid-hosts, wheezy
   merulo:
     address: 192.25.206.58
     parents: gw-ftcollins
-    hostgroups: computers, porterbox, hasusrfs, squeeze
+    hostgroups: computers, porterbox, hasusrfs, wheezy
   mundy:
     address: 192.25.206.62
     parents: gw-ftcollins
@@ -409,7 +409,7 @@ servers:
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze, bacula-client
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy, bacula-client
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
@@ -468,7 +468,7 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, porterbox, sw-raid, hassrvfs, wheezy
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
@@ -478,7 +478,7 @@ servers:
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, squeeze
+    hostgroups: computers, buildd, hasbootfs, wheezy
   # bartok TODO
   czerny:
     address: 82.195.75.109
@@ -499,7 +499,7 @@ servers:
   fils:
     address: 82.195.75.89
     parents: ganeti3
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
   vento:
     address: 82.195.75.98
@@ -516,7 +516,7 @@ servers:
   unger:
     address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, service, dl360, acpid-hosts, squeeze
+    hostgroups: computers, service, dl360, acpid-hosts, wheezy
   diamond:
     address: 82.195.75.108
     parents: ganeti3
@@ -564,7 +564,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, heavy-exim, squeeze, hasvarlogfs
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, heavy-exim, wheezy, hasvarlogfs
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -577,7 +577,7 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, squeeze
+    hostgroups: computers, buildd, hasbootfs, wheezy
 #  mayr:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
@@ -585,7 +585,7 @@ servers:
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
-    hostgroups: computers, squeeze, buildd, hassrvfs
+    hostgroups: computers, wheezy, buildd, hassrvfs
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
@@ -705,34 +705,34 @@ servers:
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   pasquini:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   luchesi:
     address: 206.12.19.214
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   tristano:
     address: 206.12.19.213
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   boito:
     address: 206.12.19.216
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   bertali:
     address: 206.12.19.212
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   ganeti2:
     address: 206.12.19.23
     parents: sw-ubcece-kais
     hostgroups: notacomputer
   tchaikovsky:
     address: 206.12.19.118
-    parents: luchesi
+    parents: ganeti2
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
   dinis:
     address: 206.12.19.139 
@@ -776,22 +776,22 @@ servers:
     check_command: dsa_check_always_ok
   falla:
     address: 206.12.19.117
-    parents: luchesi
-    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
+    parents: ganeti2
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   fano:
     address: 206.12.19.110
-    parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    parents: ganeti2
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
   finzi:
     address: 206.12.19.111
-    parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    parents: ganeti2
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
   fischer:
     address: 206.12.19.112
     parents: ganeti2
-    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
@@ -799,7 +799,7 @@ servers:
   corelli:
     address: 206.12.19.16
     parents: sw-ubcece-kais
-    hostgroups: computers, buildd, squeeze
+    hostgroups: computers, buildd, wheezy
   lucatelli:
     address: 206.12.19.15
     parents: sw-ubcece-kais
@@ -811,7 +811,7 @@ servers:
   salieri:
     address: 206.12.19.20
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, wheezy
   traetta:
     address: 206.12.19.21
     parents: sw-ubcece-kais
@@ -826,20 +826,20 @@ servers:
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   quantz:
     address: 206.12.19.122
-    parents: salieri
+    parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts, autofs
   nono:
     address: 206.12.19.123
-    parents: salieri
+    parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, xinetd-hosts, apache2-hosts, apache-https
   reger:
     address: 206.12.19.124
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, heavy-exim
   danzi:
     address: 206.12.19.125
-    parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts, xinetd-hosts
+    parents: ganeti2
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, postgres91-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: traetta
@@ -847,11 +847,11 @@ servers:
   dukas:
     address: 206.12.19.128
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs, apache-https
   tye:
     address: 206.12.19.129
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
+    parents: ganeti2
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
   elgar:
     address: 206.12.19.130
     parents: salieri
@@ -862,7 +862,7 @@ servers:
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https, bacula-client
   gombert:
     address: 206.12.19.132
-    parents: traetta
+    parents: ganeti2
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, heavy-exim, apache2-hosts
   jenkins:
     address: 206.12.19.133
@@ -870,11 +870,11 @@ servers:
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy
   blavet:
     address: 206.12.19.134
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts, nfs-client, autofs
+    parents: ganeti2
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
   barriere:
     address: 206.12.19.135
-    parents: traetta
+    parents: ganeti2
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   diabelli:
     address: 206.12.19.136
@@ -882,7 +882,7 @@ servers:
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, bacula-client
   bizet:
     address: 206.12.19.137
-    parents: traetta
+    parents: ganeti2
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   lilburn:
     address: 206.12.19.138
@@ -890,8 +890,8 @@ servers:
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs
   popov:
     address: 206.12.19.119
-    parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    parents: ganeti2
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   beach:
     address: 206.12.19.140
     parents: ganeti2
@@ -903,7 +903,7 @@ servers:
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs, hassrvfs
   menotti:
     address: 206.12.19.143
     parents: ganeti2
@@ -912,7 +912,7 @@ servers:
   coincy:
     address: 206.12.19.144
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy
   stanley:
     address: 206.12.19.145
     parents: ganeti2
@@ -933,7 +933,7 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-utwente
   klecker:
@@ -2090,18 +2090,6 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: wheezy
-  -
-    name: RAID - arrayprobe
-    servicegroups: raid
-    nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehosts: franck
-    excludehostgroups: wheezy
-  -
-    name: RAID - arrayprobe
-    servicegroups: raid
-    nrpe: "sudo /usr/bin/arrayprobe -f /dev/cciss/c1d0"
-    hosts: franck
   -
     name: HW - hpacucli status
     servicegroups: raid