X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=77446756b74a4d6b947f5e038202ea33ab709cf5;hb=55660702c484de35641fb4122699a5ebca2c2716;hp=c3c8ffcd9e27d0a506f4ae2fbd1cb25a5d652b98;hpb=38c28d9ca8bbce8522c981854789e84112c2d65e;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c3c8ffc..7744675 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -197,15 +197,15 @@ servers:
     check_command: dsa_check_always_ok
 
   vasks:
-    address: 217.196.43.132
+    address: 217.196.43.140
     parents: gw-telegraaf2
-    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-server, xinetd-hosts, postgres84-hosts
+    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https
     contact_groups: alioth-admins
 
   wagner:
-    address: 217.196.43.140
+    address: 217.196.43.132
     parents: gw-telegraaf2
-    hostgroups: computers, nfs-client, postgres84-hosts, xinetd-hosts, apache2-hosts, acpid-hosts
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https
     contact_groups: alioth-admins
 
   samosa:
@@ -669,6 +669,10 @@ servers:
     address: 206.12.19.129
     parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
+  elgar:
+    address: 206.12.19.130
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
 
   lebrun:
     address: 193.198.184.10
@@ -1334,6 +1338,7 @@ services:
     name: puppet
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
     hostgroups: computers
+    excludehosts: wagner, vasks
 
  ####
   -
@@ -1440,6 +1445,7 @@ services:
     servicegroups: weaksshkeys
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
     hostgroups: computers
+    excludehosts: wagner, vasks
     normal_check_interval:  60
  ####
   -
@@ -1553,34 +1559,39 @@ services:
     name: process - clamav - clamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u clamav -C clamd -a '/usr/sbin/clamd'"
     hostgroups: heavy-exim, heavy-postfix
+    hosts: wagner
   -
     name: service - clamav
     nrpe: "/usr/lib/nagios/plugins/check_clamd -H /var/run/clamav/clamd.ctl"
     hostgroups: heavy-exim, heavy-postfix
+    hosts: wagner
     depends: process - clamav - clamd
   -
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
+    hosts: wagner
     hostgroups: heavy-exim, heavy-postfix
   -
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
+    excludehosts: wagner
   -
     name: unwanted process - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
+    excludehosts: wagner
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
-    excludehosts: powell
+    excludehosts: powell, wagner
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: powell
+    hosts: powell, wagner
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1588,7 +1599,7 @@ services:
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
-    hosts: liszt
+    hosts: liszt, wagner
     hostgroups: spamd
     depends: process - spamd - master
   #
@@ -1606,7 +1617,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt, busoni
+    excludehosts: liszt, busoni, wagner
 
  ###
   #-
@@ -1770,6 +1781,7 @@ services:
   -
     name: setup - ud-ldap freshness
     nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
+    excludehosts: wagner, vasks
     hostgroups: computers
   -
     name: system - available entropy
@@ -1830,7 +1842,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, byrd, abel, alwyn
+    excludehosts: grieg, byrd, abel, alwyn, vasks
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -2016,7 +2028,7 @@ services:
   -
     name: process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C inetd -a '/usr/sbin/inetd'"
-    hosts: grieg, byrd
+    hosts: grieg, byrd, vasks
  ###
   -
     name: process - xinetd