X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=2bdf21c637d779f22d186adaeebb76051bfc7756;hb=c969adb2e9eb73db88112d3313086b33a9bd64da;hp=dc48a16c44d48ba91b1e0eaba85932caa34e466b;hpb=79eac1515a88063ad07717f8fb5a302d9c535a47;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index dc48a16..2bdf21c 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -80,7 +80,7 @@ servers:
     address: 193.62.202.20
     parents: gw-ubc
     hostgroups: routing-infrastructure
-    contacts: tjrc1
+    contacts: tjrc1, dave
   gw-frost:
     address: 130.81.27.83
     parents: gw-ubc
@@ -259,6 +259,10 @@ servers:
     address: 82.195.75.98
     parents: gw-man-da
     hostgroups: computers, acpid-hosts, service
+  nielsen:
+    address: 82.195.75.99
+    parents: gw-man-da
+    hostgroups: computers, acpid-hosts, service, apache2-hosts
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -286,7 +290,7 @@ servers:
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay
   byrd:
     address: 82.195.75.92
     parents: unger
@@ -395,7 +399,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
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, bind9-hosts
     contacts: bzed
 
   pergolesi:
@@ -408,23 +412,23 @@ servers:
     parents: gw-sanger
     # SMP kernel doesn't run stable
     hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers
-    contacts: tjrc1
+    contacts: tjrc1, dave
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
     hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs
-    contacts: tjrc1
+    contacts: tjrc1, dave
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
     hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts, service, apache2-hosts
-    contacts: tjrc1
+    contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
     hostgroups: computers, porterbox, sw-raid, sparc
-    contacts: tjrc1
+    contacts: tjrc1, dave
 
   voltaire:
     address: 72.66.115.54
@@ -449,7 +453,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres83-hosts, apache-https
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres84-hosts, apache-https
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -625,6 +629,14 @@ servers:
     address: 206.12.19.123
     parents: salieri
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, xinetd-hosts, apache2-hosts, apache-https
+  reger:
+    address: 206.12.19.124
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, heavy-exim
+  danzi:
+    address: 206.12.19.125
+    parents: luchesi
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -742,7 +754,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
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -881,6 +893,9 @@ hostgroups:
   heavy-exim:
     alias: "hosts running the full mail stuff, including clamav and postgrey"
     private: 1
+  mail-relay:
+    alias: "relays usually are hosts with more exim processes"
+    private: 1
   spamd:
     alias: "hosts running spamassassin as daemon"
     private: 1
@@ -1080,6 +1095,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
+    excludehosts: ries
+  -
+    name: disk usage on /srv
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
+    hosts: ries
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -1120,7 +1141,7 @@ services:
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck
+    hosts: busoni, wieck, heininen
 
   -
     name: disk usage on /srv/morgue.debian.org
@@ -1437,8 +1458,12 @@ services:
     name: process - exim
     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
+    excludehostgroups: postfix-hosts, mail-relay
     excludehosts: master, busoni, merkel, quantz
+  -
+    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'"
+    hostgroups: mail-relay
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
@@ -1875,7 +1900,7 @@ services:
   -
     name: process - bosserver
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
-    hostgroups: bosserver 
+    hostgroups: bosserver
 
  ###
   -
@@ -2233,6 +2258,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
     hosts: bellini
 
+  -
+    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
+
  ############ MISC OTHER Stuff ############
  #####
   -