X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=379faf6a1a8eade7e0ef0a85b9b58e1d8ef0df24;hb=b27c4c8f3c342f8875481d51a7cf93c222839012;hp=1a06b3db17e58dd994392fed76db78e30a11e3bf;hpb=92e95c6f5e5f6902e79cc823d75cc51081b63448;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 1a06b3d..379faf6 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -10,18 +10,16 @@
 #  - *: mailq
 #  - *: check munin stats collection works
 #  - *: check backups are successful
+#  - goetz: gmond/gmetad
 #  -
 #  - agnesi
-#  - albeniz
 #  - bruckner
 #  - caballero
 #  - casals
 #  - crest
 #  - elara
-#  - escher
 #  - europa
 #  - goedel
-#  - goetz
 #  - kassia
 #  - kullervo
 #  - lebrun
@@ -33,10 +31,8 @@
 #  - mundy
 #  - murphy
 #  - paer
-#  - pergolesi
 #  - piatti
 #  - puccini
-#  - raptopr
 #  - ravel
 #  - sarti
 #  - schulz
@@ -94,6 +90,22 @@ servers:
     address: 195.49.152.190
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-freenet:
+    address: 62.104.23.249
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-topalis:
+    address: 195.243.109.254
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-sanger:
+    address: 193.62.202.18
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-cst:
+    address: 213.188.99.215
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -117,11 +129,11 @@ servers:
   peri:
     address: 192.25.206.15
     parents: samosa
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, sw-raid
   penalosa:
     address: 192.25.206.68
     parents: samosa
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, sw-raid
 
   bartok:
     address: 82.195.75.91
@@ -188,6 +200,30 @@ servers:
     parents: gw-dg-i.net
     hostgroups: computers, buildd, sw-raid
 
+  pergolesi:
+    address: 62.104.23.252
+    parents: gw-freenet
+    hostgroups: computers, porterbox, sw-raid
+
+  raptor:
+    address: 195.243.109.162
+    parents: gw-topalis
+    hostgroups: computers, porterbox
+
+  albeniz:
+    address: 193.62.202.27
+    parents: gw-sanger
+    hostgroups: computers, porterbox, sw-raid
+  goetz:
+    address: 193.62.202.26
+    parents: gw-sanger
+    hostgroups: computers, buildd, sw-raid
+
+  escher:
+    address: 213.188.99.215
+    parents: gw-cst
+    hostgroups: computers, porterbox
+
 #############################
 # host groups
 #
@@ -291,15 +327,15 @@ services:
   -
     name: disk usage on /boot
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz
   -
     name: disk usage on /var
     nrpe: "/usr/lib/nagios/plugins/check_disk 50 75 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel, saens
+    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel, saens, pergolesi
   -
     name: disk usage on /srv
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
@@ -315,15 +351,19 @@ services:
   -
     name: disk usage on /tmp
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens
+    hosts: samosa, raff, gluck, saens, escher
   -
     name: disk usage on /usr
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa, gluck, saens
+    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: gluck
+    hosts: gluck, raptor, escher
+  -
+    name: disk usage on /chroot
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /chroot"
+    hosts: raptor
 
  ############ All Computers ############
  ####
@@ -410,11 +450,20 @@ services:
     # etch: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ntp -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
+    excludehosts: raptor
   -
     name: network service - ntp
     check: check_ntp
     hostgroups: computers
     depends: process - ntpd
+    excludehosts: raptor
+  #
+  -
+    name: network service - time
+    check: check_time
+    hosts: raptor
+    depends: process - xinetd
+
  ###
   -
     name: process - atd
@@ -605,7 +654,7 @@ services:
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
     hostgroups: computers
-    excludehosts: arcadelt, agricola, argento, penalosa, peri
+    excludehosts: arcadelt, agricola, argento, penalosa, peri, escher
 
 
 
@@ -651,7 +700,7 @@ services:
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a 'udevd'"
-    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa
+    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, escher
  ###
   -
     name: process - acpid
@@ -662,7 +711,7 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa
+    hosts: samosa, raptor
     hostgroups: rsyncd-hosts
  ###
   -
@@ -812,3 +861,9 @@ services:
     name: process - buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
     hostgroups: buildd
+
+ ###
+  -
+    name: process - iscsid
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 1: -u root -C iscsid '/usr/sbin/iscsid'"
+    hosts: raptor