From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 5 Mar 2010 22:17:18 +0000 (+0100)
Subject: no-samhain group is no longer in use
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=65358c60e208c9346a1c225e99fef50326ffb3ff;p=mirror%2Fdsa-nagios.git

no-samhain group is no longer in use
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 68ab408..96af11e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -226,11 +226,6 @@ servers:
     parents: gw-man-da
     hostgroups: computers, service, dl385, bind9-hosts, hasvarfs, ulogd-hosts
     contacts: joerg, bzed
-  #morales:
-  #  address: 82.195.75.97
-  #  parents: gw-man-da
-  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, hasvarfs, hasusrfs
-  #  contacts: bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
@@ -776,10 +771,6 @@ hostgroups:
     alias: Hosts running squeeze
     private: 1
 
-  no-samhain:
-    alias: hosts not running samhain properly
-    private: 1
-
   kvmdomains:
     alias: Hosts that are KVM domains
     private: 1
@@ -1103,13 +1094,11 @@ services:
     name: process - samhain
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
     hostgroups: computers
-    excludehostgroups: no-samhain
   -
     name: samhain
     servicegroups: samhain
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
-    excludehostgroups: no-samhain
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5