X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=6a6399ba635a7a69b737e421477cfe2a43cb4de4;hb=94c1c3cd379c5761c1171b542446ff6a1b98a2e6;hp=68ab4084162f00ccf7bb5c7bef93598c82eea7ae;hpb=2bd3cb314556a83f6c541aac1257c1e42f3b8494;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 68ab408..6a6399b 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -207,7 +207,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -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
@@ -283,7 +278,7 @@ servers:
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, no-udev, hasbootfs, hashomefs, ntpsuckers
+    hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers
   purcell:
     address: 82.195.75.69
     parents: gw-man-da
@@ -458,7 +453,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid
 
   pescetti:
     address: 217.114.76.85
@@ -552,7 +547,7 @@ servers:
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
@@ -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