X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=57522fef2c39bc8669d74bdc3a3b2b02552dec2c;hb=78ab457449bb6c5600d9145422ebcce64994d132;hp=94b210ec98d64b4b52595afcc9173284cf6f151a;hpb=34816cfa599726fb4d7c33e02091a14b22069312;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 94b210e..57522fe 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -220,12 +220,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -263,7 +263,7 @@ servers:
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, tftpd-hosts
+    hostgroups: computers, buildd, lenny
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -289,7 +289,7 @@ servers:
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
+    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, no-samhain
 
   klecker:
     address: 194.109.137.218
@@ -302,9 +302,9 @@ servers:
     hostgroups: computers, no-udev, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
 
   argento:
-    address: 195.49.152.174
+    address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
 
   pergolesi:
@@ -364,7 +364,7 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts
+    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
@@ -419,7 +419,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny
     contacts: luk
 
   agnesi:
@@ -1000,17 +1000,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, gluck
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, gluck
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, rietz, merkel
+    hosts: master, rietz, merkel, gluck
  ###
   -
     name: process - clamav - clamd
@@ -1630,7 +1630,7 @@ services:
   -
     name: process - stunnel4 - postgres-udd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd.conf'"
-    hosts: merkel
+    hosts: merkel, master
 
  ####
   #-