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

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 43e638f..d3af20c 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:
@@ -121,14 +120,22 @@ 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
+  gw-carnet:
+    address: 161.53.160.1
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -165,6 +172,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 +339,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 +347,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
 #
@@ -471,15 +492,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"
@@ -495,15 +516,15 @@ 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"
-    hosts: raptor, escher, voltaire
+    hosts: raptor, escher, voltaire, lebrun
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
@@ -516,6 +537,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"
@@ -871,7 +896,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 +943,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