X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=94b210ec98d64b4b52595afcc9173284cf6f151a;hb=a8b294431970b6cb40ebfc3ecd74c77dec5e0e5c;hp=37278f34a52eab9f98facf750bfdb758b6f60289;hpb=865c51df958cfce281aeb84c71ec7422d2825e2f;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 37278f3..94b210e 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -17,7 +17,6 @@
 
 # down:
 #  - sarti
-#  - goedel
 #  - leisner
 
 ---
@@ -151,6 +150,10 @@ servers:
     address: 78.32.9.209
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-cst:
+    address: 213.188.99.215
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -193,7 +196,7 @@ servers:
   paer:
     address: 192.25.206.11
     parents: samosa
-    hostgroups: computers, porterbox, bind9-hosts, single-cpu
+    hostgroups: computers, porterbox, lenny
   merulo:
     address: 192.25.206.58
     parents: samosa
@@ -207,7 +210,7 @@ servers:
   morales:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu
+    hostgroups: computers, porterbox, single-cpu, no-samhain
     contacts: bzed
   sperger:
     address: 82.195.75.98
@@ -467,7 +470,16 @@ servers:
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox
+    hostgroups: computers, porterbox, lenny
+
+  escher:
+    address: 213.188.99.215
+    parents: gw-cst
+    hostgroups: computers, single-cpu
+  goedel:
+    address: 213.188.99.214
+    parents: gw-cst
+    hostgroups: computers, single-cpu
 
 #############################
 # host groups
@@ -678,12 +690,12 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem, ball
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem, ball, goedel, escher
   -
     name: disk usage on /var
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell, escher
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -708,7 +720,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti
+    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -718,7 +730,7 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, lebrun, rem, ball
+    hosts: raptor, voltaire, lebrun, rem, ball, paer, escher
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -1314,12 +1326,6 @@ services:
     name: process - rngd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd  -a '/usr/sbin/rngd -r /dev/hwrng'"
     hostgroups: dl385
- ###
-  -
-    name: process - sensord
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C sensord  -a '/usr/sbin/sensord -f daemon'"
-    hosts: bartok
-
  ###
   -
     name: process - mdadm monitor
@@ -1667,10 +1673,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
     hostgroups: tftpd-hosts
  ###
-  -
-    name: process - dhcpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
-    hosts: paer
+#  -
+#    name: process - dhcpd
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
+#    hosts: paer
  ###
   -
     name: process - monit