X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=61b64f3a0e8cce65ed44e4092a7ee048dd432ebc;hb=2f5da8fcc2bea32d73b7191fddb95507b8152cee;hp=3724cf45de3ef6c961edb66b90779584ef2f73b5;hpb=7b63ceafdb61752b91bd7fce157ecaf270830bd1;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3724cf4..61b64f3 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -444,11 +444,6 @@ servers:
     parents: kassia
     hostgroups: secondary-IPs
 
-  allegri:
-    address: 157.193.39.233
-    parents: gw-ghent
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs, incomingmailrelayed2025
-    contacts: luk
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
@@ -468,7 +463,7 @@ servers:
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server
   dijkstra:
     address: 137.82.84.70
     parents: gw-ubc
@@ -492,11 +487,11 @@ servers:
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs
+    hostgroups: computers, lenny, hasbootfs, nfs-client, hashomefs, hassrvfs
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
-    hostgroups: computers, lenny, hassrvfs, sw-raid
+    hostgroups: computers, lenny, hashomefs, sw-raid
 
   lebrun:
     address: 193.198.184.10
@@ -860,6 +855,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
     hosts: stabile
+  -
+    name: disk usage on /srv/mirrors
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
+    hosts: stabile
+  -
+    name: disk usage on /srv/ftp-master.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/ftp-master.debian.org"
+    hosts: stabile
 
  ############ All Computers ############
  ####
@@ -1062,12 +1067,12 @@ services:
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: allegri, zelenka, ancina
+    excludehosts: zelenka, ancina
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: allegri, zelenka, ancina
+    hosts: zelenka, ancina
     depends: process - xinetd
 
  ###
@@ -1138,6 +1143,7 @@ services:
     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
@@ -1154,12 +1160,17 @@ services:
     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'"
     hostgroups: heavy-exim
-    excludehosts: rietz, merkel, raff
+    excludehosts: rietz, merkel, raff, 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 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
+    hosts: 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 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1532,13 +1543,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: allegri, gluck, zelenka, ancina, draghi
+    hosts: gluck, 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: allegri, gluck, zelenka, ancina, draghi
+    excludehosts: gluck, zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1839,6 +1850,10 @@ services:
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
     hosts: merkel, raff
+  -
+    name: nfs mount ftp archive
+    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
+    hosts: bellini
 
  ############ MISC OTHER Stuff ############
  #####