X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f1a44b6661de9b44673490c104b9195fef06e1ac;hb=361477af36a5e41bb4d8cceba6963c5d1609e041;hp=2b081b5608fc04fd55e47a129db1bf4ad2f60773;hpb=2712ad63beb3da92f7b83d23be98c4a36c77e5ee;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 2b081b5..f1a44b6 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -185,7 +185,7 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: spohr
-    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
+    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
   merkel2:
     address: 192.25.206.71
     parents: merkel
@@ -266,7 +266,7 @@ servers:
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, bind9-hosts
   draghi:
     address: 82.195.75.106
     parents: unger
@@ -415,7 +415,7 @@ servers:
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
 
   caballero:
     address: 193.201.200.200
@@ -489,11 +489,15 @@ servers:
   geo2:
     address: 137.82.84.71
     parents: dijkstra
-    hostgroups: computers, service, lenny, hasbootfs, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
   duarte:
     address: 137.82.84.77
     parents: dijkstra
     hostgroups: computers, lenny, hasbootfs, hassrvfs
+  valente:
+    address: 137.82.84.76
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, single-cpu
 
   lebrun:
     address: 193.198.184.10
@@ -893,7 +897,7 @@ services:
 
   -
     name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-puppet"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -f /var/lib/puppet/state/state.yaml"
     hostgroups: lenny
     excludehosts: agnesi
 
@@ -1081,6 +1085,7 @@ services:
     name: process - syslog-ng
     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: lenny
+    excludehosts: agnesi
  ###
  # -
  #   name: process - rsyslogd
@@ -1836,6 +1841,10 @@ services:
 
  ############ MISC OTHER Stuff ############
  #####
+  -
+    name: mirror sync - bugs
+    check: "dsa_check_mirrorsync!bugs.debian.org!project/trace/bugs-master.debian.org"
+    hosts: global
   -
     name: mirror sync - security
     check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"