X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=70758b98569f684110fe2deff179ec77772d5c45;hb=6a3266f46987b42ba97fb828e328b9e2642d8347;hp=55da53d58783b3515b138283376177a1346891d2;hpb=b011f87061c9950b34e8f939ea396d3971b09e67;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 55da53d..70758b9 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -249,7 +249,7 @@ servers:
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers
+    hostgroups: computers, ulogd-hosts, acpid-hosts
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -269,7 +269,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, ulogd-hosts
   ball:
     address: 82.195.75.70
     parents: gw-man-da
@@ -662,7 +662,7 @@ servers:
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, hassrvfs
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
@@ -1285,6 +1285,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: squeeze
 
+  -
+    name: remote logging
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: heininen
+    hostgroups: computers
  ### MAIL STUFF
  ###
   -
@@ -1740,11 +1745,11 @@ services:
     check: check_tcp!873
     hosts: rietz2
     depends: rietz:process - xinetd
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: kassia-sec
-    depends: kassia:process - xinetd
+  #-
+  #  name: network service - rsync
+  #  check: check_tcp!873
+  #  hosts: kassia-sec
+  #  depends: kassia:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873
@@ -1779,7 +1784,8 @@ services:
     name: network service - http
     check: check_http
     depends: kassia:process - apache2 - master
-    hosts: kassia-sec, kassia-ftp, kassia-volatile
+    #hosts: kassia-sec, kassia-ftp, kassia-volatile
+    hosts: kassia-ftp, kassia-volatile
 
   # keyserver on kaufmann
   -
@@ -1858,7 +1864,8 @@ services:
   -
     name: network service - ftp
     check: check_ftp
-    hosts: kassia-sec, kassia-ftp
+    #hosts: kassia-sec, kassia-ftp
+    hosts: kassia-ftp
     depends: kassia:process - xinetd
 
  ####
@@ -2090,12 +2097,12 @@ services:
   -
     name: DNS SEC - signature expiry
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d /var/cache/bind/git/domains"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d /srv/dns.debian.org/var/gitdns/domains"
     runfrom: draghi
   -
     name: DNS SEC - delegations
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /var/cache/bind/git/domains check-header"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /srv/dns.debian.org/var/gitdns/domains check-header"
     runfrom: draghi
 
  ############