X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=1a8505f9d7f6725e201857f62ae85d065bfc749b;hb=1aca38ba059311439ff3bd014ea6e55560bb516e;hp=446a26a95fb55909ed2bb452bbbe449a5e8b11f0;hpb=0f23fba3a62671a01242cbb428859adcb00e66ba;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 446a26a..1a8505f 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
@@ -162,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
@@ -183,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
@@ -267,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
@@ -332,10 +342,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
@@ -346,6 +358,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
@@ -714,7 +727,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
 
  ###
@@ -1116,10 +1129,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..