X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=d56bb58c969b86486bd6781d6ec75fc9044b0668;hb=8c03a80f5867ce62ef581e46276f237de38822fb;hp=dd6d476eb8f37b55a2ded4dd130804608625b312;hpb=3deb9ecc523b1cf3ceedd1b9dc5460c1c85ff4c7;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index dd6d476..d56bb58 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -177,7 +177,7 @@ servers:
   paer:
     address: 192.25.206.11
     parents: samosa
-    hostgroups: computers, porterbox, bind9-hosts
+    hostgroups: computers, porterbox, bind9-hosts, single-cpu
   merulo:
     address: 192.25.206.58
     parents: samosa
@@ -201,12 +201,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, no-samhain
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, no-samhain
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -285,7 +285,7 @@ servers:
   argento:
     address: 195.49.152.174
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, no-samhain
     contacts: bzed
 
   pergolesi:
@@ -323,7 +323,7 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, no-samhain
     contacts: sfrost
 
   puccini:
@@ -370,7 +370,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, no-samhain
     contacts: luk
 
   agnesi:
@@ -466,6 +466,10 @@ hostgroups:
     alias: Hosts running lenny, not etch
     private: 1
 
+  no-samhain:
+    alias: hosts not running samhain properly
+    private: 1
+
   syslog-ng-hosts:
     alias: hosts running syslog-ng instead of sysklogd
     private: 1
@@ -700,11 +704,13 @@ 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-samhain -t 45"
     hostgroups: computers
+    excludehostgroups: no-samhain
     depends: process - samhain
     normal_check_interval: 240
     retry_check_interval: 5