X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=fd3cd694a56882f6d23002a06c9942aa68430980;hb=65f5eda071333458bccafc11ff63e697fd19ac9d;hp=855cfcb0ea0c31f2b2af714efe377b0f4592917b;hpb=4d70649af1913862fdf791453c3d2b16f0643c7d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 855cfcb..fd3cd69 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -140,10 +140,6 @@ servers:
     address: 195.71.99.193
     parents: gw-ubc
     hostgroups: routing-infrastructure
-  gw-ball:
-    address: 78.32.9.209
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-cst:
     address: 213.188.99.215
     parents: gw-ubc
@@ -284,6 +280,14 @@ servers:
     address: 82.195.75.101
     parents: unger
     hostgroups: computers, service, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
+  ball:
+    address: 82.195.75.70
+    parents: gw-man-da
+    hostgroups: computers, buildd, no-udev, hasbootfs, hashomefs, ntpsuckers
+  purcell:
+    address: 82.195.75.69
+    parents: gw-man-da
+    hostgroups: computers, buildd
 
   master:
     address: 70.103.162.29
@@ -544,7 +548,7 @@ servers:
   cimarosa:
     address: 206.12.19.8
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim, apache2-hosts
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
@@ -599,11 +603,6 @@ servers:
     parents: gw-telefonica
     hostgroups: computers, buildd, hasbootfs, hashomefs
 
-  ball:
-    address: 78.32.9.213
-    parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, hashomefs, ntpsuckers
-
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
@@ -711,8 +710,6 @@ hostgroups:
     private: 1
   deadslow:
     alias: Systems too slow to run any real checks
-  dialup:
-    alias: Systems with slow network
   freebsd:
     alias: freebsd
     private: 1
@@ -910,14 +907,14 @@ services:
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: routing-infrastructure, dialup
+    excludehostgroups: routing-infrastructure
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
-    hostgroups: routing-infrastructure, dialup
+    hostgroups: routing-infrastructure
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
@@ -1539,6 +1536,11 @@ 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 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
+    excludehostgroups: squeeze
+  -
+    name: process - monit
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    hostgroups: squeeze
  ###
   -
     name: process - cpqarrayd
@@ -1717,7 +1719,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky
+    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, cimarosa
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1730,7 +1732,8 @@ services:
     # draghi		db.debian.org
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
-    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz
+    # cimarosa		buildd.debian.org
+    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz, cimarosa
     depends: network service - https
     normal_check_interval: 60
 
@@ -2004,6 +2007,17 @@ services:
     name: DNS SOA sync - 2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
     hosts: global
+  -
+    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"
+    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"
+    runfrom: draghi
+
  ############
   -
     name: ping alive check