X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=230bf36c9b2bb9cd46061c328a4c0c0edb14120a;hb=9c043216a62a8f800c5e7c904118eb3115925652;hp=53152107811249e97e2601fd500bcb9e0edff407;hpb=7b627bf69d54c684d9ce76757906fb81cb37da96;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5315210..230bf36 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -131,6 +131,10 @@ servers:
     address: 82.94.249.153
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-telegraaf2:
+    address: 217.196.40.15
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
     contact_groups: +alioth-admins
   gw-helsinki:
     address: 128.214.173.25
@@ -194,14 +198,14 @@ servers:
 
   vasks:
     address: 217.196.43.132
-    parents: gw-telegraaf
+    parents: gw-telegraaf2
     hostgroups: computers
     contact_groups: alioth-admins
 
   wagner:
     address: 217.196.43.140
-    parents: gw-telegraaf
-    hostgroups: computers
+    parents: gw-telegraaf2
+    hostgroups: computers, nfs-client, postgres84-hosts, inetd-hosts, apache2-hosts, acpid-hosts
     contact_groups: alioth-admins
 
   samosa:
@@ -1337,17 +1341,20 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
     hostgroups: computers
     excludehostgroups: freebsd
+    excludehosts: vasks, wagner
   -
     name: puppetized firewall
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
     hostgroups: computers
     excludehostgroups: freebsd
+    excludehosts: vasks, wagner
 
  ####
   -
     name: process - samhain
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
     hostgroups: computers
+    excludehosts: vasks, wagner
   -
     name: samhain
     servicegroups: samhain
@@ -1356,6 +1363,7 @@ services:
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5
+    excludehosts: vasks, wagner
 
  ####
   -
@@ -1452,15 +1460,18 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
     hostgroups: computers
     excludehostgroups: freebsd
+    excludehosts: vasks, wagner
   -
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
     hostgroups: freebsd
+    excludehosts: vasks, wagner
   -
     name: network service - munin-node
     check: check_tcp!4949
     hostgroups: computers
     depends: process - munin-node
+    excludehosts: vasks, wagner
  ###
   -
     name: process - ntpd
@@ -1497,17 +1508,20 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
     excludehostgroups: freebsd
+    excludehosts: vasks, wagner
 
   -
     name: process - syslog-ng
     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: freebsd
+    excludehosts: vasks, wagner
 
   -
     name: remote logging
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: heininen
     hostgroups: computers
+    excludehosts: vasks, wagner
  ### MAIL STUFF
  ###
   -
@@ -1762,22 +1776,26 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy"
     event_handler: dsa_event_handler_restart_ekey
     hostgroups: computers
+    excludehosts: vasks, wagner
     excludehostgroups: freebsd
  ###
   -
     name: local resolver
     nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
     hostgroups: computers
+    excludehosts: vasks, wagner
     normal_check_interval: 60
   -
     name: process - unbound
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
+    excludehosts: vasks, wagner
     hostgroups: unbound-hosts, squeeze
  ###
   -
     name: process - uptimed
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
     hostgroups: computers
+    excludehosts: vasks, wagner
  ###
   -
     name: unwanted process - irqbalance
@@ -1848,6 +1866,7 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
+    excludehosts: vasks, wagner
   -
     name: process - cpqarrayd
     servicegroups: raid
@@ -1960,10 +1979,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
     hostgroups: computers
     excludehostgroups: freebsd, sparc
+    excludehosts: vasks, wagner
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
     hostgroups: freebsd, sparc
+    excludehosts: vasks, wagner
 
  ###
   -