X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=a3aa86f1f0d886b0214ca10fc8f4b0333ff9ed81;hb=35b57800427121013389d320f5f70b0e973c2c48;hp=43e638f596edd8c1512098e4d7290d30b11af3cd;hpb=85ccbfb46c123a29a882558ce7973a67ecb2749d;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 43e638f..a3aa86f 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -18,8 +18,6 @@
 #  -
 #  - piatti
 #  - tartini
-#sarge:
-#  - spontini
 
 # down:
 #  - ravel
@@ -121,14 +119,18 @@ servers:
     address: 130.89.160.1
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
-  gw-ughent:
-    address: 157.193.39.254
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
+  #gw-ughent:
+  #  address: 157.193.39.254
+  #  parents: gw-HP-ftc
+  #  hostgroups: routing-infrastructure
   gw-agnesi:
     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
 
   samosa:
     address: 192.25.206.57
@@ -165,6 +167,10 @@ servers:
     address: 192.25.206.11
     parents: samosa
     hostgroups: computers, porterbox, bind9-hosts
+  merulo:
+    address: 192.25.206.58
+    parents: samosa
+    hostgroups: computers, porterbox
 
   bartok:
     address: 82.195.75.91
@@ -328,7 +334,7 @@ servers:
 
   allegri:
     address: 157.193.39.233
-    parents: gw-ughent
+    parents: gw-HP-ftc
     hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu
 
   agnesi:
@@ -336,6 +342,11 @@ servers:
     parents: gw-agnesi
     hostgroups: deadslow
 
+  spontini:
+    address: 137.82.84.42
+    parents: gw-ubc
+    hostgroups: computers, buildd, single-cpu
+
 #############################
 # host groups
 #
@@ -495,11 +506,11 @@ services:
   -
     name: disk usage on /tmp
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, escher, puccini
+    hosts: samosa, raff, gluck, saens, escher, puccini, merkel
   -
     name: disk usage on /usr
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini
+    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini, merulo
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
@@ -871,7 +882,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
@@ -918,14 +929,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