X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=57522fef2c39bc8669d74bdc3a3b2b02552dec2c;hb=78ab457449bb6c5600d9145422ebcce64994d132;hp=ceec2fb6846bf6c799faef07901f366a8a8d9d72;hpb=98464f6c368f3ab8b32a3a8944d4286402dc2058;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index ceec2fb..57522fe 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
@@ -217,12 +220,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -260,7 +263,7 @@ servers:
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, tftpd-hosts
+    hostgroups: computers, buildd, lenny
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -286,7 +289,7 @@ servers:
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
+    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, no-samhain
 
   klecker:
     address: 194.109.137.218
@@ -299,9 +302,9 @@ servers:
     hostgroups: computers, no-udev, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
 
   argento:
-    address: 195.49.152.174
+    address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
 
   pergolesi:
@@ -361,7 +364,7 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts
+    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
@@ -416,7 +419,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny
     contacts: luk
 
   agnesi:
@@ -464,6 +467,20 @@ servers:
     parents: gw-ball
     hostgroups: computers, buildd, no-udev, dialup
 
+  zelenka:
+    address: 80.245.147.40
+    parents: gw-HP-ftc
+    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
 #
@@ -673,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
@@ -693,7 +710,7 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -703,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
@@ -713,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
@@ -835,6 +852,7 @@ services:
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
+    excludehosts: zelenka
  ####
   -
     name: process - sshd
@@ -928,18 +946,18 @@ 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
+    excludehosts: raptor, zelenka
   -
     name: network service - ntp
     check: check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: raptor, allegri
+    excludehosts: raptor, allegri, zelenka
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: raptor, allegri
+    hosts: raptor, allegri, zelenka
     depends: process - xinetd
 
  ###
@@ -982,17 +1000,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, gluck
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, gluck
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, rietz, merkel
+    hosts: master, rietz, merkel, gluck
  ###
   -
     name: process - clamav - clamd
@@ -1308,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
@@ -1408,13 +1420,13 @@ 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, raptor, allegri, gluck
+    hosts: samosa, raptor, allegri, gluck, zelenka
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, raptor, allegri, gluck
+    excludehosts: samosa, raptor, allegri, gluck, zelenka
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1618,7 +1630,7 @@ services:
   -
     name: process - stunnel4 - postgres-udd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd.conf'"
-    hosts: merkel
+    hosts: merkel, master
 
  ####
   #-
@@ -1647,6 +1659,7 @@ services:
     servicegroups: 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
+    contacts: luk
 
  ###
   -
@@ -1660,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