Merge branch 'master' of ssh://db.debian.org/org/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 cc15f81..5ece35c 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -310,7 +310,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload, hasbootfs, etch, xinetd-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -1132,11 +1132,6 @@ services:
     name: load
     nrpe: "/usr/lib/nagios/plugins/check_load -w 140,120,100 -c 240,220,200"
     hostgroups: highload
-    excludehosts: rietz
-  -
-    name: load
-    nrpe: "/usr/lib/nagios/plugins/check_load -w 200,200,200 -c 350,350,350"
-    hosts: rietz
  ####
   -
     name: processes - zombies
@@ -1544,7 +1539,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: rietz, grieg
+    excludehosts: grieg
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1713,12 +1708,12 @@ services:
     hosts: draghi
     depends: process - xinetd
  ###
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hostgroups: rsyncd-hosts
-    depends: process - xinetd
-
+#  -
+#    name: network service - rsync
+#    check: check_tcp!873
+#    hostgroups: rsyncd-hosts
+#    depends: process - xinetd
+#
   -
     name: network service - rsync
     check: check_tcp!873
@@ -1772,7 +1767,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, grieg
+    hosts: ries, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1786,7 +1781,7 @@ services:
     # merkel2          nm.debian.org
     # liszt            lists.debian.org
     # cimarosa         buildd.debian.org
-    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz, grieg
+    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg
     depends: network service - https
     normal_check_interval: 60