X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f7534ea98b7b35ecec5b05a90887924282429480;hb=f98b914893c207ad88c23404f78d546b946d60f9;hp=1c81d2ada470023f182402b164555310ace3e845;hpb=9df1ff40470d7e2ca329981cb27b822f5b8c88cc;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 1c81d2a..f7534ea 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -181,6 +181,10 @@ servers:
     address: 200.17.202.254
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-zivit:
+    address: 80.245.144.3
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -190,7 +194,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, xinetd-hosts, apache2-hosts, squeeze
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
@@ -206,7 +210,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, unbound-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -237,7 +241,7 @@ servers:
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, lenny
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, squeeze
     contacts: bzed
   agricola:
     address: 82.195.75.86
@@ -269,7 +273,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, lenny
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze
   geo1:
     address: 82.195.75.105
     parents: unger
@@ -277,7 +281,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, lenny
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -293,7 +297,7 @@ servers:
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, lenny
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
   byrd:
     address: 82.195.75.92
     parents: unger
@@ -306,7 +310,7 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, unbound-hosts, lenny
+    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
@@ -373,7 +377,7 @@ servers:
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, lenny
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, squeeze
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
@@ -402,7 +406,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, unbound-hosts, squeeze
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, squeeze
     contacts: bzed
 
   pergolesi:
@@ -507,12 +511,12 @@ servers:
   spontini:
     address: 206.12.19.14
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, lenny, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
     parents: tchaikovsky
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, lenny
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
@@ -547,7 +551,7 @@ servers:
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, lenny
+    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, squeeze, autofs
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
@@ -559,7 +563,7 @@ servers:
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, lenny
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
@@ -567,7 +571,7 @@ servers:
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, lenny
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, lenny, autofs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -623,7 +627,7 @@ servers:
   quantz:
     address: 206.12.19.122
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts
+    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
@@ -639,16 +643,24 @@ servers:
   glinka:
     address: 206.12.19.126
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts, autofs
+  dukas:
+    address: 206.12.19.128
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
+  tye:
+    address: 206.12.19.129
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, lenny
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, squeeze
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
 
   tartini:
     address: 82.94.249.158
@@ -668,12 +680,12 @@ servers:
 
   zelenka:
     address: 80.245.147.40
-    parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hassrvfs, xinetd-hosts, lenny
+    parents: gw-zivit
+    hostgroups: computers, porterbox, hassrvfs, squeeze
   zandonai:
     address: 80.245.147.46
-    parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, lenny
+    parents: gw-zivit
+    hostgroups: computers, buildd, hassrvfs, squeeze
 
   goedel:
     address: 213.188.99.214
@@ -688,11 +700,11 @@ servers:
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, hassrvfs, lenny
+    hostgroups: computers, buildd, hassrvfs, squeeze
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, squeeze
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, squeeze, autofs
 
 #  lafayette:
 #    address: 147.215.7.160
@@ -715,7 +727,7 @@ servers:
   holter:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service, lenny
+    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service, squeeze
   barber:
     address: 194.177.211.203
     parents: gw-grnet
@@ -757,7 +769,7 @@ servers:
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -765,7 +777,7 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, hassrvfs
     # which raid?
   lindberg:
     address: 86.59.118.149
@@ -801,11 +813,11 @@ servers:
   poulenc:
     address: 144.32.168.77
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
 
   santoro:
     address: 200.17.202.197
@@ -975,6 +987,9 @@ hostgroups:
   nfs-server:
     alias: hosts serving filesystems using NFS
     private: 1
+  autofs:
+    alias: hosts running the automounter
+    private: 1
 
   highload:
     alias: "hosts on which high load is normal"
@@ -1438,19 +1453,18 @@ services:
     name: process - ntpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
-    excludehosts: zelenka
   -
     name: network service - ntp
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: zelenka, ancina
+    excludehosts: ancina
     excludehostgroups: ntpsuckers
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: zelenka, ancina
+    hosts: ancina
     depends: process - xinetd
 
  ###
@@ -1733,6 +1747,7 @@ services:
   -
     name: system - available entropy
     nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy"
+    event_handler: dsa_event_handler_restart_ekey
     hostgroups: computers
     excludehostgroups: freebsd
  ###
@@ -1784,7 +1799,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, byrd
+    excludehosts: grieg, byrd, abel, alwyn
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1843,6 +1858,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: kassia
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -1855,6 +1871,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
     normal_check_interval: 120
     hostgroups: dl585
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:2 --ignore-transfer-speed=1I:1:3 --ignore-transfer-speed=1I:1:4 --ignore-transfer-speed=2I:1:5 --ignore-transfer-speed=2I:1:6"
+    normal_check_interval: 120
+    hosts: kassia
  ###
   -
     name: HW - hpasmcli status
@@ -2265,7 +2287,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
     hosts: fano, fasch, field, finzi
     contacts: luk, pkern, HE
-
+    contact_groups:
   -
     name: process - buildd
     servicegroups: buildd
@@ -2273,6 +2295,7 @@ services:
     hostgroups: buildd
     excludehosts: fano, fasch, field, finzi
     contacts: luk, pkern, HE
+    contact_groups:
 
  ###
   #-
@@ -2327,6 +2350,16 @@ services:
     name: nfs server stabile reachable
     nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.13 -w 50,10% -c 200,30%"
     hosts: quantz
+  #
+  -
+    name: process - automount
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C automount -a '/usr/sbin/automount'"
+    hostgroups: autofs
+  -
+    name: unwanted process - automount
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C automount"
+    hostgroups: computers
+    excludehostgroups: autofs
 
  ############ MISC OTHER Stuff ############
  #####