X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b445b2c0b68602fb0ca95d0f735b08774e35ca81;hb=91bc2ee82201f60775c1579a9a4dcd1770714d19;hp=a265400c2a6071bb277cc81171e534601bc3cad5;hpb=3da8ae7e9d74b05a7c8386c2ca0952f3573a11ce;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a265400..b445b2c 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
@@ -192,7 +191,7 @@ servers:
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze, apache-https, bacula-client
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https, bacula-client
   wieck:
     address: 195.20.242.89
     parents: gw-ubcece
@@ -217,19 +216,19 @@ servers:
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, deadslow
   arnold:
     address: 217.140.96.57
     parents: gw-arm
@@ -349,7 +348,7 @@ servers:
   gluck:
     address: 150.203.164.38
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-conova
   sompek:
@@ -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
@@ -468,12 +467,12 @@ 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
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
     contacts: bzed
   ball:
     address: 82.195.75.70
@@ -483,11 +482,11 @@ servers:
   czerny:
     address: 82.195.75.109
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
   clementi:
     address: 82.195.75.103
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
   bendel:
     address: 82.195.75.100
     parents: ganeti3
@@ -499,7 +498,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 +515,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
@@ -532,11 +531,11 @@ servers:
   handel:
     address: 82.195.75.104
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
+    hostgroups: computers, service, kvmdomains, apache2-hosts, wheezy, apache-https
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, wheezy
   ganeti3:
     address: 82.195.75.111
     parents: gw-man-da
@@ -564,7 +563,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, wheezy, hasvarlogfs
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -585,7 +584,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
@@ -645,7 +644,7 @@ servers:
   eysler:
     address: 86.59.118.152
     parents: gw-sil
-    hostgroups: computers, buildd, squeeze
+    hostgroups: computers, buildd, wheezy
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
@@ -786,7 +785,7 @@ servers:
   finzi:
     address: 206.12.19.111
     parents: ganeti2
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
   fischer:
     address: 206.12.19.112
@@ -815,7 +814,7 @@ servers:
   traetta:
     address: 206.12.19.21
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, wheezy
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -835,15 +834,15 @@ servers:
   reger:
     address: 206.12.19.124
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, apache-https, heavy-exim
   danzi:
     address: 206.12.19.125
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, postgres91-hosts, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, xinetd-hosts
   dukas:
     address: 206.12.19.128
     parents: traetta
@@ -851,11 +850,11 @@ servers:
   tye:
     address: 206.12.19.129
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
   elgar:
     address: 206.12.19.130
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy
   berlioz:
     address: 206.12.19.131
     parents: traetta
@@ -863,19 +862,19 @@ servers:
   gombert:
     address: 206.12.19.132
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, heavy-exim, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, apache2-hosts
   jenkins:
     address: 206.12.19.133
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, wheezy
   blavet:
     address: 206.12.19.134
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
   barriere:
     address: 206.12.19.135
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
   diabelli:
     address: 206.12.19.136
     parents: traetta
@@ -883,15 +882,15 @@ servers:
   bizet:
     address: 206.12.19.137
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
   lilburn:
     address: 206.12.19.138
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs
   popov:
     address: 206.12.19.119
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   beach:
     address: 206.12.19.140
     parents: ganeti2
@@ -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
@@ -926,7 +925,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ugent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, wheezy
     contacts: luk
   # }}}
   # {{{ gw-umn
@@ -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:
@@ -1649,6 +1648,7 @@ services:
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
     hostgroups: wheezy
+    excludehostgroups: freebsd
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -2475,27 +2475,6 @@ services:
     name: process - pglistener
     nrpe: "/usr/lib/nagios/plugins/check_procs -u pglisten -C python -a '/usr/bin/python /usr/share/pglistener/starter.py /etc/pglistener/pglistener.cfg /etc/pglistener/conf.d' -w 1: -c 1:"
     hosts: wagner, vasks
-
- ####
-  #-
-  #  name: process - xenconsoled
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenconsoled -a 'xenconsoled'"
-  #  hosts: piatti
-  #-
-  #  name: process - xenstored
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenstored -a '/usr/lib/xen-3.0.3-1/bin/xenstored --pid-file /var/run/xenstore.pid'"
-  #  hosts: piatti
-  #-
-  #  name: process - xend
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C python -a 'python /usr/lib/xen-3.0.3-1/bin/xend start'"
-  #  hosts: piatti
-#
- ####
-  -
-    name: process - libvirtd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C libvirtd -a '/usr/sbin/libvirtd -d'"
-    hosts: unger
-
  ###
   -
     name: process - buildd