X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=fd0718e3fcf697642106e7963c7aad12be257d0b;hb=2246f5d7db410e64863dae2499bfc8b6594c2d5f;hp=4e6975af07fd8e76dcff7fbcc2cb8e9856da3c81;hpb=b738fdef569643251a00f9e7d33831cce0a6c3fc;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 4e6975a..fd0718e 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -15,11 +15,10 @@
 #  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
 #  - puccini: mailgraph
+#  - lebrun: ippl
 #  -
 #  - piatti
 #  - tartini
-#sarge:
-#  - spontini
 
 # down:
 #  - ravel
@@ -102,7 +101,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-1und1:
-    address: 195.20.247.53
+    address: 195.20.247.54
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-blackcat:
@@ -129,6 +128,14 @@ servers:
     address: 65.173.90.18
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-ubc:
+    address: 137.82.84.41
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-carnet:
+    address: 161.53.160.1
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -301,6 +308,7 @@ servers:
     address: 87.106.4.56
     parents: gw-1und1
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts
+    contacts: joerg
 
   caballero:
     address: 193.201.200.200
@@ -340,6 +348,16 @@ servers:
     parents: gw-agnesi
     hostgroups: deadslow
 
+  spontini:
+    address: 137.82.84.42
+    parents: gw-ubc
+    hostgroups: computers, buildd
+
+  lebrun:
+    address: 161.53.160.165
+    parents: gw-carnet
+    hostgroups: computers, buildd
+
 #############################
 # host groups
 #
@@ -475,15 +493,15 @@ services:
   -
     name: disk usage on /boot
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer, spontini
   -
     name: disk usage on /var
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire, puccini
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire, puccini, lebrun
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini
+    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
@@ -507,7 +525,7 @@ services:
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, escher, voltaire
+    hosts: raptor, escher, voltaire, lebrun
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
@@ -520,6 +538,10 @@ services:
     name: disk usage on /mnt/hdc
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
     hosts: voltaire
+  -
+    name: disk usage on /mnt/sdb1
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/sdb1"
+    hosts: spontini
   -
     name: disk usage on /x
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
@@ -875,7 +897,7 @@ services:
 
   -
     name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:20 -c 0:50 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:40 -c 0:90 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
     hostgroups: postfix-hosts
     excludehosts: liszt
     depends: process - postfix - master
@@ -922,14 +944,18 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
     hostgroups: postfix-hosts
     depends: process - postfix - master
-    normal_check_interval: 1440
+    normal_check_interval: 120
 
 
   -
     name: setup - debian-admin in etc aliases
     nrpe: "/usr/lib/nagios/plugins/dsa-check-da-in-aliases"
     hostgroups: computers
-    normal_check_interval: 1440
+    normal_check_interval: 120
+  -
+    name: setup - ud-ldap freshness
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
+    hostgroups: computers
  ###
   -
     name: process - uptimed