X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=095efa13a127aea66ea8fce90aee4425573df948;hb=4fecb08579506430d660f0760a3b2d24d0271c40;hp=f8d7e536f7889e74124dc0883f497abeaaa335cf;hpb=beeb7dc44a55c2b4aeae5330d00b4c197d534bdb;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f8d7e53..095efa1 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -339,7 +339,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, lenny
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
@@ -352,11 +352,11 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    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
   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, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
 
   steffani:
     address: 128.31.0.36
@@ -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
@@ -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
@@ -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
@@ -1725,6 +1722,11 @@ services:
     name: setup - ud-ldap freshness
     nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
     hostgroups: computers
+  -
+    name: system - available entropy
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy"
+    hostgroups: computers
+    excludehostgroups: freebsd
  ###
   -
     name: local resolver
@@ -1919,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