X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=d4275e711d7a0047b8d04d1662096ffcd899d239;hb=e130217aad45b1b6246bf86328b686fb945566f6;hp=0c3b5adcda1f2af615dc330da2ea314fa368bb14;hpb=5db28cf937e6690622fa4e60e42a7d08fdbed335;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0c3b5ad..d4275e7 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -190,7 +190,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, xinetd-hosts, apache2-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, xinetd-hosts, apache2-hosts, unbound-hosts
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
@@ -206,7 +206,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, bind9-hosts, squeeze
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, unbound-hosts
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -302,22 +302,22 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid
+    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, unbound-hosts
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, unbound-hosts
 
 
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, postgres84-hosts
+    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, postgres84-hosts, unbound-hosts
 
   franck:
     address: 128.148.34.3
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, unbound-hosts
 
   mayer:
     address: 140.211.166.78
@@ -603,7 +603,7 @@ servers:
   traetta:
     address: 206.12.19.21
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
   schuetz:
     address: 206.12.19.119
     parents: tchaikovsky
@@ -719,7 +719,7 @@ servers:
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service
+    hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
@@ -909,6 +909,10 @@ hostgroups:
   bind9-hosts:
     alias: hosts running bind9
     private: 1
+  # once every host runs unbound, do away with this group and check "computers" instead
+  unbound-hosts:
+    alias: hosts running unbound
+    private: 1
   amavis-hosts:
     alias: hosts running amavis
     private: 1
@@ -1695,12 +1699,6 @@ services:
     depends: process - postfix - master
     normal_check_interval: 120
 
-  -
-    name: local resolver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
-    hostgroups: computers
-    normal_check_interval: 60
-
   -
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
@@ -1710,6 +1708,16 @@ services:
     name: setup - ud-ldap freshness
     nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
     hostgroups: computers
+ ###
+  -
+    name: local resolver
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
+    hostgroups: computers
+    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'"
+    hostgroups: unbound-hosts
  ###
   -
     name: process - uptimed