X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=0a6f600ba4dfcdbdacdf1b57728995a70f62d258;hb=b38b2a7223d6dbe82761fab2fbf57732705100b1;hp=5a0daa02526df92c4f417bf34b5f89ab2ec81e0d;hpb=ff7349df79be17fd501fe9c294cd6d275b33c29f;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 5a0daa0..0a6f600 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -12,13 +12,11 @@
 #  - *: check backups are successful
 #  -
 #  - agnesi
-#  - albeniz
 #  - bruckner
 #  - caballero
 #  - casals
 #  - crest
 #  - elara
-#  - escher
 #  - europa
 #  - goedel
 #  - goetz
@@ -35,7 +33,6 @@
 #  - paer
 #  - piatti
 #  - puccini
-#  - raptopr
 #  - ravel
 #  - sarti
 #  - schulz
@@ -97,6 +94,18 @@ servers:
     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
@@ -193,9 +202,24 @@ servers:
 
   pergolesi:
     address: 62.104.23.252
-    parents: gw-dg-i.net
+    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
 
+  escher:
+    address: 213.188.99.215
+    parents: gw-cst
+    hostgroups: computers, porterbox
+
 #############################
 # host groups
 #
@@ -299,11 +323,11 @@ 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
   -
     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"
@@ -323,7 +347,7 @@ 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"
@@ -331,7 +355,11 @@ services:
   -
     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 ############
  ####
@@ -418,11 +446,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
@@ -613,7 +650,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
 
 
 
@@ -659,7 +696,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
@@ -670,7 +707,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
  ###
   -
@@ -820,3 +857,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