From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 20 May 2014 18:23:19 +0000 (+0200)
Subject: remove questionable uses of deadslow
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bf1b8663fbe7bcb83a42d9b26f8502aefc9b4d66;p=mirror%2Fdsa-nagios.git

remove questionable uses of deadslow
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4f9cf44..5846dba 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -1687,7 +1687,6 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: ancina
-    excludehostgroups: deadslow
     servicegroups: time
   #
   -
@@ -1792,19 +1791,18 @@ services:
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
     hostgroups: computers
-    excludehostgroups: heavy-exim, heavy-postfix, deadslow
+    excludehostgroups: heavy-exim, heavy-postfix
   -
     name: unwanted process - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
-    excludehostgroups: heavy-exim, heavy-postfix, deadslow
+    excludehostgroups: heavy-exim, heavy-postfix
  ###
   -
     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: spamd
     excludehosts: picconi
-    excludehostgroups: deadslow
   -
     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'"
@@ -1833,7 +1831,7 @@ services:
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
-    excludehostgroups: spamd, deadslow
+    excludehostgroups: spamd
     excludehosts: bendel, busoni, buxtehude
 
  ###
@@ -1846,7 +1844,6 @@ services:
     name: unwanted process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
     hostgroups: computers
-    excludehostgroups: deadslow
 
  ###
   -
@@ -1862,7 +1859,7 @@ services:
     name: unwanted process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
     hostgroups: computers
-    excludehostgroups: heavy-postfix, heavy-exim, deadslow
+    excludehostgroups: heavy-postfix, heavy-exim
  ###
   -
     name: process - amavis - master
@@ -1878,7 +1875,7 @@ services:
     name: unwanted process - amavis
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C amavisd-new"
     hostgroups: computers
-    excludehostgroups: amavis-hosts, deadslow
+    excludehostgroups: amavis-hosts
  ###
   -
     name: process - weightd - master
@@ -1899,7 +1896,7 @@ services:
     name: unwanted process - policyd-weight
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight"
     hostgroups: computers
-    excludehostgroups: heavy-postfix, deadslow, alioth
+    excludehostgroups: heavy-postfix, alioth
 
 
  ###
@@ -2029,7 +2026,6 @@ services:
     name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
     hostgroups: computers
-    excludehostgroups: deadslow
 
  ####
  ###
@@ -2045,23 +2041,20 @@ services:
     name: unwanted process - gkrellmd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
     hostgroups: computers
-    excludehostgroups: deadslow
   -
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
     hostgroups: computers
-    excludehostgroups: nfs-client, nfs-server, deadslow
+    excludehostgroups: nfs-client, nfs-server
   -
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
     excludehosts: abel, alwyn
-    excludehostgroups: deadslow
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
     hostgroups: computers
-    excludehostgroups: deadslow
 
  ####
   -
@@ -2270,7 +2263,7 @@ services:
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehostgroups: xinetd-hosts, deadslow
+    excludehostgroups: xinetd-hosts
  ###
   -
     name: network service - finger
@@ -2326,7 +2319,7 @@ services:
     name: unwanted process - apache2
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"
     hostgroups: computers
-    excludehostgroups: apache2-hosts, deadslow
+    excludehostgroups: apache2-hosts
 
   -
     name: network service - http
@@ -2378,7 +2371,7 @@ services:
     name: unwanted network service - https
     check: dsa_check_port_closed!443
     hostgroups: apache2-hosts
-    excludehostgroups: apache-https, deadslow
+    excludehostgroups: apache-https
     # ravel does ssh on port 443
     excludehosts: ravel
     normal_check_interval: 60
@@ -2415,7 +2408,7 @@ services:
     name: unwanted process - named
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C named"
     hostgroups: computers
-    excludehostgroups: bind9-hosts, deadslow
+    excludehostgroups: bind9-hosts
 
  ####
   -
@@ -2464,7 +2457,7 @@ services:
     name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres91-hosts, deadslow
+    excludehostgroups: postgres91-hosts
   -
     name: unwanted process - postgresql 9.0
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
@@ -2576,7 +2569,7 @@ services:
     name: unwanted process - automount
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C automount"
     hostgroups: computers
-    excludehostgroups: autofs, deadslow
+    excludehostgroups: autofs
 
  ############ MISC OTHER Stuff ############
  #####