X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=89cb4aa42184a6ad4062d465a97db145db835842;hb=a40aa7afe2f5260f8aa4853e5b50694dd6bf3484;hp=05dde8e2b84103df04bb64dc7bb232c1210bfb25;hpb=8b9066d2ee000dcb6b3c692d309067ee95fa409d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 05dde8e..89cb4aa 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -356,12 +356,12 @@ servers:
   gluck:
     address: 150.203.164.38
     parents: gw-anu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
 
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
@@ -373,7 +373,7 @@ servers:
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts, lenny
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts, squeeze
   #carver:
   #  address: 128.31.0.50
   #  parents: gw-mit-csail
@@ -387,7 +387,7 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
 
   argento:
     address: 93.94.130.160
@@ -404,7 +404,7 @@ servers:
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, lenny
+    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
 
   albeniz:
     address: 193.62.202.27
@@ -470,7 +470,7 @@ servers:
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, smart, hasorgfs, lenny
+    hostgroups: computers, porterbox, smart, hasorgfs, squeeze
 
   kassia:
     address: 130.89.149.224
@@ -503,7 +503,7 @@ servers:
   spontini:
     address: 206.12.19.14
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, lenny
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, lenny, squeeze
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
@@ -559,7 +559,7 @@ servers:
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, lenny
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
@@ -735,7 +735,7 @@ servers:
   orff:
     address: 194.177.211.209
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs, apache2-hosts, lenny
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs, apache2-hosts, squeeze
   field:
     address: 194.177.211.210
     parents: rautavaara
@@ -945,9 +945,6 @@ hostgroups:
   mysql-hosts:
     alias: hosts running mysql
     private: 1
-  no-udev:
-    alias: hosts not using udev
-    private: 1
   no-ulogd:
     alias: hosts not running ulogd
     private: 1
@@ -1924,11 +1921,11 @@ services:
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C udevd -a 'udevd'"
     hostgroups: computers
-    excludehostgroups: no-udev, freebsd
+    excludehostgroups: freebsd
   -
     name: unexpected process - udev
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
-    hostgroups: no-udev, freebsd
+    hostgroups: freebsd
  ###
   -
     name: process - acpid