X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=d7a19650058cd99992117a89596171934a3ce96b;hb=dedd2f50e4e88e1bb29f78da0c6550bcf97be774;hp=649f8f41b4d8cef95e81160cb6d65d0bfca49342;hpb=0c101db162b450d1d1b6df37bd6b2a3f61dd1909;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 649f8f4..d7a1965 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -36,6 +36,7 @@ servers:
     address: 82.195.75.126
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+    contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
     parents: samosa
@@ -76,6 +77,7 @@ servers:
     address: 195.49.152.190
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+    contacts: bzed
   gw-freenet:
     address: 62.104.23.249
     parents: gw-HP-ftc
@@ -88,6 +90,7 @@ servers:
     address: 193.62.202.18
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+    contacts: tjrc1
   gw-cst:
     address: 213.188.99.215
     parents: gw-HP-ftc
@@ -104,6 +107,7 @@ servers:
     address: 195.20.247.54
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+    contacts: joerg
   gw-blackcat:
     address: 193.201.200.129
     parents: gw-HP-ftc
@@ -160,10 +164,12 @@ servers:
     address: 192.25.206.15
     parents: samosa
     hostgroups: computers, buildd, sw-raid, single-cpu
+    contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: samosa
     hostgroups: computers, buildd, sw-raid, single-cpu
+    contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: samosa
@@ -181,22 +187,27 @@ servers:
     address: 82.195.75.91
     parents: gw-man-da
     hostgroups: computers, service, syslog-ng-hosts, postfix-hosts, dl385
+    contacts: joerg, bzed
   sperger:
     address: 82.195.75.98
     parents: gw-man-da
     hostgroups: computers, porterbox, sw-raid
+    contacts: bzed
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
     hostgroups: computers, porterbox, sw-raid, single-cpu
+    contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
     hostgroups: computers, buildd, sw-raid, single-cpu
+    contacts: bzed
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385
+    contacts: bzed
 
   master:
     address: 70.103.162.29
@@ -265,6 +276,7 @@ servers:
     address: 195.49.152.174
     parents: gw-dg-i.net
     hostgroups: computers, buildd, sw-raid, single-cpu
+    contacts: bzed
 
   pergolesi:
     address: 62.104.23.252
@@ -284,10 +296,12 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     hostgroups: computers, porterbox, sw-raid
+    contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     hostgroups: computers, buildd, sw-raid
+    contacts: tjrc1
 
   escher:
     address: 213.188.99.215
@@ -303,6 +317,7 @@ servers:
     address: 72.66.115.54
     parents: gw-frost
     hostgroups: computers, buildd
+    contacts: sfrost
 
   puccini:
     address: 87.106.4.56
@@ -328,10 +343,12 @@ servers:
     address: 217.114.76.82
     parents: gw-nmmn
     hostgroups: deadslow
+    contacts: luk
   crest:
     address: 217.114.76.83
     parents: gw-nmmn
     hostgroups: deadslow
+    contacts: luk
 
   kassia:
     address: 130.89.175.54
@@ -342,6 +359,7 @@ servers:
     address: 157.193.39.233
     parents: gw-HP-ftc
     hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu
+    contacts: luk
 
   agnesi:
     address: 65.173.90.83
@@ -466,6 +484,8 @@ servicegroups:
     alias: diskusage checks
   buildd:
     alias: buildd checks
+  raid:
+    alias: raid checks
 
 #############################
 # services
@@ -710,7 +730,7 @@ services:
  ###
   -
     name: process - cron
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C cron -a /usr/sbin/cron"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C cron -a /usr/sbin/cron"
     hostgroups: computers
 
  ###
@@ -896,7 +916,7 @@ services:
     depends: process - postfix - master
   -
     name: process - postfix - anvil
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C anvil -a 'anvil -l -t unix -u'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:1 -c 0: -u postfix -C anvil -a 'anvil -l -t unix -u'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
@@ -1047,22 +1067,38 @@ services:
  ###
   -
     name: process - mdadm monitor
+    servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /var/run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
   -
     name: RAID - sw raid
+    servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw"
     hostgroups: sw-raid
 
  ###
   -
     name: process - cpqarrayd
+    servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
     hostgroups: dl385, dl380, dl360
   -
     name: RAID - arrayprobe
+    servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360
+ ###
+  -
+    name: RAID - DAC960
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-dac960"
+    hosts: verdi
+ ###
+  -
+    name: RAID - 3ware
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
+    hosts: puccini
 
  ###
   -
@@ -1112,10 +1148,6 @@ services:
     depends: rietz:process - xinetd
 
  ###
-  -
-    name: process - nagios1
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nagios -C nagios -a '/usr/sbin/nagios -d /etc/nagios/nagios.cfg'"
-    hosts: samosa
   -
     name: process - nagios3
     # there is always one extra process per check currently running..