X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=1f5ba375e8ff2dca9fbb5eed0694dafbc6912a84;hb=a954bc7230672fc0303f37ba3b17bc3b322fe770;hp=da240c42f101099a550df3d60406580a5d8f3681;hpb=caad5c814cd1f43c767fdeee6148394704b0ee1b;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index da240c4..1f5ba37 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -5,7 +5,6 @@
 # vim:set syntax=yaml:
 
 # TODO
-#  - raff:  identd, hpasmd
 #  - spohr: hpasmd
 #  - *: mailq
 #  - *: check munin stats collection works
@@ -166,7 +165,7 @@ servers:
   raff:
     address: 192.25.206.59
     parents: samosa
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny
   gluck:
     address: 192.25.206.10
     parents: samosa
@@ -258,7 +257,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts, heavy-exim, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts, heavy-exim, acpid-hosts, lenny
 
   mayer:
     address: 140.211.166.78
@@ -381,7 +380,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid, bind9-hosts
+    hostgroups: computers, no-udev, buildd, sw-raid, lenny
 
   elara:
     address: 67.210.160.90
@@ -443,7 +442,7 @@ servers:
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny
 
   lebrun:
     address: 193.198.184.10
@@ -1327,7 +1326,6 @@ services:
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
     hostgroups: computers
-    excludehosts: lobos
 
 
  ############ Processes/Services that only run on some computers ############
@@ -1657,13 +1655,6 @@ services:
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C python -a 'python /usr/lib/xen-3.0.3-1/bin/xend start'"
   #  hosts: piatti
 #
- ####
-  # XXX is this needed?
-  -
-    name: process - snmpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u snmp -C snmpd -a '/usr/sbin/snmpd -Lsd -Lf /dev/null -u snmp -I -smux -p /var/run/snmpd.pid 127.0.0.1'"
-    hosts: lobos
-
  ####
   -
     name: process - libvirtd
@@ -1698,7 +1689,7 @@ services:
   -
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C monit -a '/usr/sbin/monit -d 30 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
-    hosts: lobos, steffani, kassia, master
+    hosts: steffani, kassia, master
  ###
   -
     name: process - smartd