Merge branch 'master' of ssh://db.debian.org/org/db.debian.org/git/dsa-nagios

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3f2a37e..6a6399b 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -141,7 +141,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-cst:
-    address: 213.188.99.215
+    address: 213.157.2.210
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-isc:
@@ -207,7 +207,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd
+    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
@@ -409,7 +404,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, megaraid
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
@@ -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
@@ -651,7 +646,8 @@ servers:
   fasch:
     address: 194.177.211.201
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, mptraid
+    hostgroups: computers, freebsd, squeeze
+    #, mptraid
   holter:
     address: 194.177.211.202
     parents: gw-grnet
@@ -687,7 +683,8 @@ servers:
   field:
     address: 194.177.211.210
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, mptraid
+    hostgroups: computers, freebsd, squeeze
+    #, mptraid
 
   beethoven:
     address: 86.59.118.146
@@ -774,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
@@ -1101,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