X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=8e1592cdfc421efe235baf7ad8e28ab475933631;hb=4b187121667cd9f23851924d13c2bf562b2855ce;hp=ffe360e60faedaecd77e69823e2b9cbd76b61b9d;hpb=aaf3a8695992dc673edaa2704205344869c4ef36;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index ffe360e..8e1592c 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -151,7 +151,7 @@ servers:
   gluck:
     address: 192.25.206.10
     parents: samosa
-    hostgroups: computers, no-udev, general, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, highload
+    hostgroups: computers, no-udev, general, dl380, apache1-hosts, bind9-hosts, heavy-exim, highload
   merkel:
     address: 192.25.206.16
     parents: samosa
@@ -159,7 +159,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: samosa
-    hostgroups: computers, service, dl380, apache2-hosts, postgres81-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, postgres81-hosts, ulogd-hosts
   peri:
     address: 192.25.206.15
     parents: samosa
@@ -213,11 +213,11 @@ servers:
     parents: gw-man-da
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts
     contacts: bzed
-  auber:
-    address: 82.195.75.101
-    parents: gw-man-da
-    hostgroups: computers, no-udev, buildd, sw-raid
-    contacts: bzed
+#  auber:
+#    address: 82.195.75.101
+#    parents: gw-man-da
+#    hostgroups: computers, no-udev, buildd, sw-raid
+#    contacts: bzed
 
   master:
     address: 70.103.162.29
@@ -295,7 +295,7 @@ servers:
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
-    hostgroups: computers, no-udev, porterbox, single-cpu
+    hostgroups: computers, no-udev, porterbox, single-cpu, deadslow
 
   raptor:
     address: 195.243.109.162
@@ -598,7 +598,7 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, auber, schroeder, piatti
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti
   -
     name: disk usage on /var
     servicegroups: diskspace
@@ -618,7 +618,7 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento, allegri, tartini, morales, auber, powell
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -710,6 +710,7 @@ services:
     servicegroups: samhain
     nrpe: "/usr/lib/nagios/plugins/dsa-check-samhain -t 45"
     hostgroups: computers
+    excludehostgroups: no-samhain
     depends: process - samhain
     normal_check_interval: 240
     retry_check_interval: 5