Merge branch 'master' of ssh://db.debian.org/org/db.debian.org/git/dsa-nagios

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0be308c..55859c1 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -177,7 +177,7 @@ servers:
   gluck:
     address: 192.25.206.10
     parents: spohr
-    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, hasvarfs, hasusrfs
+    hostgroups: computers, no-udev, general, dl380, ulogd-hosts, lenny, hassrvfs 
   merkel:
     address: 192.25.206.16
     parents: spohr
@@ -188,7 +188,7 @@ servers:
     hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim, bind9-hosts
   spohr2:
     address: 192.25.206.38
     parents: spohr
@@ -270,7 +270,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts
 
   master:
     address: 70.103.162.29
@@ -491,15 +491,15 @@ servers:
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, nfs-client, hashomefs, hassrvfs, aacraid
+    hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
-    hostgroups: computers, lenny, hashomefs, sw-raid
+    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts
   cimarosa:
     address: 137.82.84.80
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, aacraid
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -1158,12 +1158,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 +1168,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'"