uploadqueue hostgroup. chopin is part of it, klecker not anymore

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a81ca2b..0bf9f73 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -294,7 +294,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny, uploadqueue
 
   mayer:
     address: 140.211.166.78
@@ -358,7 +358,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, heavy-exim, lenny
 
   saens:
     address: 128.101.240.212
@@ -428,7 +428,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, hassrvfs, hasbootfs
+    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -484,7 +484,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: gw-ubcnew
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue
   dijkstra:
     address: 137.82.84.70
     parents: gw-ubc
@@ -682,12 +682,6 @@ hostgroups:
     alias: hosts not running samhain properly
     private: 1
 
-  #syslog-ng-hosts:
-  #  alias: hosts running syslog-ng instead of sysklogd
-  #  private: 1
-  #rsyslog-hosts:
-  #  alias: hosts running rsyslogd instead of sysklogd
-  #  private: 1
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -736,6 +730,9 @@ hostgroups:
   acpid-hosts:
     alias: hosts running acpid
     private: 1
+  uploadqueue:
+    alias: hosts that are an anonymous ftp uploadqueue
+    private: 1
 
   nfs-client:
     alias: hosts mounting filesystems using NFS
@@ -1138,21 +1135,8 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: lenny
-    excludehosts: agnesi
- ###
- # -
- #   name: process - rsyslogd
- #   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
- #   hostgroups: rsyslog-hosts
- ###
-  -
-    name: process - syslogd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
-    hosts: rietz
-  -
-    name: process - klogd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
     hosts: rietz
+    excludehosts: agnesi
 
  ### MAIL STUFF
  ###
@@ -1699,17 +1683,17 @@ services:
   -
     name: process - vsftp - listener
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C vsftpd -a 'vsftpd: LISTENER'"
-    hostgroups: ftpd-hosts
+    hostgroups: ftpd-hosts, uploadqueue
     excludehosts: kassia
   -
     name: process - vsftp - instance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '"
-    hostgroups: ftpd-hosts
+    hostgroups: ftpd-hosts, uploadqueue
     excludehosts: kassia
   -
     name: network service - ftp
     check: check_ftp
-    hostgroups: ftpd-hosts
+    hostgroups: ftpd-hosts, uploadqueue
     excludehosts: kassia
     depends: process - vsftp - listener
   -
@@ -1722,7 +1706,7 @@ services:
   -
     name: process - debianqueued
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued"
-    hosts: ries, ravel, klecker
+    hostgroups: uploadqueue
 
  ###
   #-
@@ -1753,7 +1737,6 @@ services:
     name: process - postresql83 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
     hostgroups: postgres83-hosts
-    excludehosts: klecker
   #-
   #  name: process - postresql83 - master udd
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
@@ -1761,7 +1744,7 @@ services:
   -
     name: process - postresql83 - dak master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
-    hosts: klecker
+    hosts: klecker, chopin
   -
     name: process - postresql84 - dak master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"