X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=6c725ae27e4cfd8c4a7eed3ce97a36cbab950249;hb=f966fbee668f50cb0af6c309f630a945872e0515;hp=c30868ee49239205dd74c3aff61e51b5683a74c0;hpb=953665cd4743b1627ca7e37174013d70cd3ef33f;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index c30868e..6c725ae 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -14,7 +14,6 @@
 #  - goetz: gmond/gmetad
 #  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
-#  - puccini: mailgraph
 
 # down:
 #  - sarti
@@ -318,6 +317,11 @@ servers:
     # SMP kernel doesn't run stable
     hostgroups: computers, buildd, sw-raid, single-cpu
     contacts: tjrc1
+  smetana:
+    address: 193.62.202.29
+    parents: gw-sanger
+    hostgroups: computers, porterbox, sw-raid
+    contacts: tjrc1
 
   verdi:
     address: 192.54.42.193
@@ -327,13 +331,13 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, no-samhain
+    hostgroups: computers, buildd
     contacts: sfrost
 
   puccini:
     address: 87.106.4.56
     parents: gw-1und1
-    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, ulogd-hosts
+    hostgroups: computers, buildd, lenny, rsyslog-hosts
     contacts: joerg
   powell:
     address: 87.106.64.223
@@ -489,7 +493,7 @@ hostgroups:
     alias: hosts running postfix instead of exim
     private: 1
   heavy-exim:
-    alias: "hosts running the full mail stuff, including clamav, SA, and greylistd"
+    alias: "hosts running the full mail stuff, including clamav, SA, and postgrey"
     private: 1
   heavy-postfix:
     alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, policyd-weight"
@@ -619,12 +623,12 @@ services:
     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, puccini, lebrun, tartini, morales, powell
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell
   -
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini, ravel, mahler, schroeder, piatti
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -634,7 +638,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
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -649,7 +653,7 @@ services:
     name: disk usage on /usr
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini, merulo, tartini, morales, powell
+    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, merulo, tartini, morales, powell
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -1007,18 +1011,21 @@ services:
     hosts: merkel, raff
 
  ###
-  -
-    name: process - greylistd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
-    hostgroups: heavy-exim
+  #-
+  #  name: process - greylistd
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
+  #  hostgroups: heavy-exim
   #
   -
     name: unwanted process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
     hostgroups: computers
-    excludehostgroups: heavy-exim
 
  ###
+  -
+    name: process - postgrey
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
+    hostgroups: heavy-exim
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
@@ -1028,7 +1035,7 @@ services:
     name: unwanted process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
     hostgroups: computers
-    excludehostgroups: heavy-postfix
+    excludehostgroups: heavy-postfix, heavy-exim
  ###
   -
     name: process - amavis - master
@@ -1571,3 +1578,13 @@ services:
     name: process - mountd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rpc.mountd -a '/sbin/rpc.mountd'"
     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"
+    hosts: merkel, raff