Merge branch 'master' of ssh://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 da8438f..d19d2e7 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -224,7 +224,7 @@ servers:
   morales:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu, hasbootfs, hassrvfs, lenny, puppet
+    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, puppet
     contacts: bzed
   sperger:
     address: 82.195.75.98
@@ -496,7 +496,7 @@ servers:
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts
 
   piatti:
     address: 193.167.161.225