X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f39f3013ddc4b30549c166884031cd051e79aca6;hb=70807ab5050ff0ad61aadc87e1d1fa02d9879569;hp=2e9a0f22f32fd15e3eb604f00e441c23cec13ca9;hpb=a13f442853c6e54d7a28439d934be79fbe769fb7;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 2e9a0f2..f39f301 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -27,6 +27,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: joerg, bzed
+  gw-man-da2:
+    address: 82.195.75.46
+    parents: gw-man-da
+    hostgroups: routing-infrastructure
+    contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
     parents: spohr
@@ -177,7 +182,7 @@ servers:
   gluck:
     address: 192.25.206.10
     parents: spohr
-    hostgroups: computers, no-udev, general, dl380, ulogd-hosts, lenny, hassrvfs 
+    hostgroups: computers, no-udev, general, dl380, lenny, hassrvfs, rsyncd-hosts, acpid-hosts, apache2-hosts, ftpd-hosts
   merkel:
     address: 192.25.206.16
     parents: spohr
@@ -228,7 +233,7 @@ servers:
   #  contacts: bzed
   sperger:
     address: 82.195.75.98
-    parents: gw-man-da
+    parents: gw-man-da2
     hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
     contacts: bzed
   agricola:
@@ -833,7 +838,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: raff, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -844,11 +849,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
     hostgroups: hashomefs
-  -
-    name: disk usage on /home
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
-    hosts: gluck
   -
     name: disk usage on /mnt/hdc
     servicegroups: diskspace
@@ -1017,11 +1017,6 @@ services:
     check: dsa_check_ssh_port!2260
     hosts: agnesi
     normal_check_interval:  180
-  -
-    name: "network service - sshd - 443"
-    check: dsa_check_ssh_port!443
-    hosts: gluck
-    normal_check_interval:  180
 
   -
     name: "network service - sshd - version"
@@ -1133,17 +1128,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, gluck
+    excludehosts: master, rietz, merkel
   -
     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, gluck
+    excludehosts: master, rietz, merkel
   -
     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, gluck
+    hosts: master, rietz, merkel
  ###
   -
     name: process - clamav - clamd
@@ -1158,12 +1153,6 @@ services:
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
     hostgroups: heavy-exim, heavy-postfix
-  -
-    name: process - clamav - getsigs
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C getclamsigs -a 'getclamsigs'"
-    hostgroups: heavy-exim, heavy-postfix
-    excludehosts: master, powell
-  #
   -
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
@@ -1174,13 +1163,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
-  -
-    name: unwanted process - clamav - getsigs
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C getclamsigs"
-    hostgroups: computers
-    excludehostgroups: heavy-exim, heavy-postfix
-    hosts: master, powell
- ###
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1568,13 +1550,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: gluck, zelenka, ancina, draghi
+    hosts: zelenka, ancina, draghi
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: gluck, zelenka, ancina, draghi
+    excludehosts: zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1867,10 +1849,6 @@ services:
     hostgroups: nfs-server
  # see if the nfs stuff works and doesn't hang.
   # the df check all script will also hang, but we don't appear to pay attention to that
-  -
-    name: nfs mount ftp archive
-    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /home/org/ftp.root/debian"
-    hosts: gluck
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"