X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=29cf2d9a5cc5d1aa5b5bb00d4a3cb942a3c43ede;hb=3dfd4edc313b166ba36907944e9faf56d95ab7b0;hp=ca73b89cebf2b8ec8816ed3c0f4c5ff5e7d46257;hpb=a091e030ca2fa521ef020da9a29869b559844164;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ca73b89..29cf2d9 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -266,7 +266,7 @@ servers:
   franck:
     address: 128.148.34.3
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres90-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, squeeze
   ries:
     address: 128.148.34.103
     parents: gw-brown
@@ -345,15 +345,6 @@ servers:
     parents: gw-ftcollins
     hostgroups: computers, buildd, hasbootfs, lenny
     contacts: dannf
-  paer:
-    address: 192.25.206.11
-    parents: gw-ftcollins
-    hostgroups: computers, porterbox, hasbootfs, hashomefs, lenny
-  peri:
-    address: 192.25.206.15
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
-    contacts: dannf
   samosa:
     address: 192.25.206.57
     parents: gw-ftcollins
@@ -472,10 +463,10 @@ servers:
     address: 82.195.75.89
     parents: czerny
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-  kokkonen:
-    address: 82.195.75.97
-    parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
+  vento:
+    address: 82.195.75.98
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, heavy-exim
   lully:
     address: 82.195.75.99
     parents: czerny
@@ -484,16 +475,10 @@ 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-da
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, squeeze
-    contacts: bzed
   unger:
     address: 82.195.75.102
     parents: gw-man-da
     hostgroups: computers, service, dl360, acpid-hosts, squeeze
-  # byrd TODO
   diamond:
     address: 82.195.75.108
     parents: unger
@@ -530,6 +515,14 @@ servers:
     address: 140.211.15.34
     parents: gw-osuosl
     hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze, hasvarlogfs
+  byrd:
+    address: 140.211.166.20
+    parents: gw-osuosl
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+  buxtehude:
+    address: 140.211.166.26
+    parents: byrd
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, squeeze, hasvarlogfs
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -542,15 +535,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
@@ -631,7 +624,7 @@ servers:
   wagner:
     address: 217.196.43.132
     parents: gw-telegraaf2
-    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres91-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
   # }}}
   # {{{ gw-ubcece
@@ -660,7 +653,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
@@ -705,10 +698,6 @@ servers:
     address: 206.12.19.113
     parents: dijkstra
     hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
-  duarte:
-    address: 206.12.19.114
-    parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze, nfs-server
   morricone:
     address: 206.12.19.9
     parents: sw-ubcece-kais
@@ -725,10 +714,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
@@ -808,7 +793,7 @@ servers:
   dukas:
     address: 206.12.19.128
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs, apache-https
   tye:
     address: 206.12.19.129
     parents: traetta
@@ -824,7 +809,7 @@ servers:
   gombert:
     address: 206.12.19.132
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim, apache2-hosts
   jenkins:
     address: 206.12.19.133
     parents: salieri
@@ -856,11 +841,19 @@ 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
     hostgroups: computers, service, kvmdomains, squeeze, postgres91-hosts, nfs-client, apache2-hosts, autofs
+  sonntag:
+    address: 206.12.19.142
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, nfs-client, autofs, hassrvfs
+  menotti:
+    address: 206.12.19.143
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts, apache-https
   # }}}
   # {{{ gw-ugent
   ancina:
@@ -1296,8 +1289,8 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: samosa, stabile, sibelius, busoni
-
+    hosts: samosa, stabile, sibelius, busoni, buxtehude
+  -
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
@@ -1333,21 +1326,16 @@ 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
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.0/dak"
     hosts: franck
+  -
+    name: disk usage on /var/lib/postgresql/9.1/dak
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.1/dak"
+    hosts: franck
   -
     name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
@@ -1358,6 +1346,26 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /srv/pgbackup"
     hosts: franck
+  -
+    name: disk usage on /srv/pgbackup
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/pgbackup"
+    hosts: beethoven
+  -
+    name: disk usage on /srv/git-backup
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/git-backup"
+    hosts: beethoven
+  -
+    name: disk usage on /srv/da-backup
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/da-backup"
+    hosts: beethoven
+  -
+    name: disk usage on /srv/bacula
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/bacula"
+    hosts: beethoven
 
  ############ All Computers ############
  ####
@@ -1625,7 +1633,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts, mail-relay
-    excludehosts: master, busoni, quantz
+    excludehosts: master, busoni, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
@@ -1635,11 +1643,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, quantz
+    excludehosts: master, busoni, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, busoni, quantz
+    hosts: master, busoni, quantz, buxtehude
   -
     name: mail queue
     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
@@ -1696,18 +1704,18 @@ services:
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
-    hosts: busoni
+    hosts: busoni, buxtehude
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
-    hosts: busoni
+    hosts: busoni, buxtehude
   #
   -
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: bendel, busoni, wagner
+    excludehosts: bendel, busoni, wagner, buxtehude
 
  ###
   #-
@@ -2150,11 +2158,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
 
  ###
   -
@@ -2411,11 +2419,6 @@ services:
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
   #  hostgroups: tftpd-hosts
  ###
-#  -
-#    name: process - dhcpd
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
-#    hosts: paer
- ###
 
  ############ NFS Stuff ############
  ####