From: Stephen Gran <steve@lobefin.net>
Date: Tue, 2 Aug 2011 06:42:28 +0000 (+0100)
Subject: add new hostgroup to exclude samhain checks on some machines
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=e8001f4612f95aedad497ac24d274c47bba908be;p=mirror%2Fdsa-nagios.git

add new hostgroup to exclude samhain checks on some machines

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3547711..6b2460c 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -199,13 +199,13 @@ servers:
   vasks:
     address: 217.196.43.140
     parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https
+    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
     contact_groups: alioth-admins
 
   wagner:
     address: 217.196.43.132
     parents: gw-telegraaf2
-    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
 
   samosa:
@@ -241,7 +241,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze, brokensamhain
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -253,7 +253,7 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts, squeeze
+    hostgroups: computers, buildd, acpid-hosts, squeeze, brokensamhain
 
   sperger:
     address: 82.195.75.34
@@ -706,7 +706,7 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, squeeze, brokensamhain
 
   goedel:
     address: 213.188.99.214
@@ -1061,6 +1061,10 @@ hostgroups:
     alias: "hosts who's ntp offset is often unknown"
     private: 1
 
+  brokensamhain:
+    alias: machines that can not run samhain
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -1372,7 +1376,7 @@ 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
-    excludehosts: vasks, wagner
+    excludehostgroups: brokensamhain
   -
     name: samhain
     servicegroups: samhain
@@ -1381,7 +1385,7 @@ services:
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5
-    excludehosts: vasks, wagner
+    excludehostgroups: brokensamhain
 
  ####
   -