X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=a7727a12fe89ac9d405c3c5a35fa060f997e765b;hb=44243809a95abb25a3979c5da14ee993dab535aa;hp=1f77863f2620860ced58fd67ddb6371d32642a0e;hpb=7821b073d86afb86540fff6dc5e3d2ddb12c2456;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 1f77863..a7727a1 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -8,7 +8,6 @@
 #  - *: check munin stats collection works
 #  - *: check backups are successful
 #  - *: unwanted: network: auth, discard, daytime, time (on some), cvs-pserver, rsync (on some), ftp (on some), http (on some)
-#  - mundy: salinfo_decode
 
 ---
 #############################
@@ -180,11 +179,11 @@ servers:
     address: 212.227.126.54
     parents: gw-ubcece
     #parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, squeeze, bacula-client
+    hostgroups: computers, acpid-hosts, service, wheezy, bacula-client
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres91-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres91-hosts, wheezy
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -389,7 +388,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-ftcollins
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, wheezy
   spohr:
     address: 192.25.206.33
     parents: gw-ftcollins
@@ -564,7 +563,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, heavy-exim, wheezy, hasvarlogfs
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -903,7 +902,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
@@ -961,11 +960,11 @@ servers:
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
   poulenc:
     address: 144.32.168.77
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
   # }}}
   # {{{ gw-zivit
   zandonai: