X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=d8f27c8536c7a84acbee533358f0b3391b17ddf7;hb=188b877bea20a60c6697fbbaf218977e647dc566;hp=aa54c0bfd9a4dc00878517639b81b192f6de96f7;hpb=34871116beb578f22f845f0c70f0a4c22374e3fd;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index aa54c0b..d8f27c8 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -81,10 +81,6 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: tjrc1
-  gw-lrz:
-    address: 129.187.0.150
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
   gw-frost:
     address: 130.81.242.195
     parents: gw-HP-ftc
@@ -200,12 +196,12 @@ servers:
   peri:
     address: 192.25.206.15
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, single-cpu
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, single-cpu
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -288,10 +284,6 @@ servers:
     address: 70.103.162.31
     parents: gw-brainfood
     hostgroups: computers, general, dl380, acpid-hosts, lenny, buildd, hasbootfs, hassrvfs
-  zee:
-    address: 80.245.147.40
-    parents: gw-brainfood
-    hostgroups: computers, porterbox, lenny, hassrvfs, hasbootfs
 
 
   ries:
@@ -319,6 +311,10 @@ servers:
     address: 140.211.166.44
     parents: rietz
     hostgroups: secondary-IPs
+  zee:
+    address: 140.211.166.16
+    parents: gw-osuosl
+    hostgroups: computers, porterbox, lenny, hassrvfs, hasbootfs
 
   villa:
     address: 212.211.132.32
@@ -427,7 +423,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, hassrvfs
+    hostgroups: computers, ulogd-hosts, lenny, hassrvfs, hasbootfs
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -519,6 +515,18 @@ servers:
   cimarosa:
     address: 137.82.84.80
     parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client
+  paganini:
+    address: 137.82.84.82
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+  respighi:
+    address: 137.82.84.83
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+  vivaldi:
+    address: 137.82.84.84
+    parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   # MSA 2000 (2012i)
   giustini:
@@ -817,7 +825,7 @@ services:
   -
     name: disk usage on /
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /"
     hosts: ries, klecker
   -
     name: disk usage on /boot
@@ -914,14 +922,14 @@ services:
     name: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    normal_check_interval: 180
+    normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   -
     name: backup server config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
     hosts: bartok
-    normal_check_interval: 180
+    normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
 
@@ -931,7 +939,7 @@ services:
     servicegroups: kernel
     nrpe: "/usr/lib/nagios/plugins/dsa-check-running-kernel"
     hostgroups: computers
-    normal_check_interval: 180
+    normal_check_interval: 60
     retry_check_interval: 5
 
  ####
@@ -1372,7 +1380,7 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
-    normal_check_interval: 120
+    normal_check_interval: 60
   -
     name: setup - ud-ldap freshness
     nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
@@ -1614,14 +1622,14 @@ services:
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
-    hosts: raff
+    hosts: kaufmann
     depends: process - apache2 - master
 
   # https on various hosts
   -
     name: network service - https
     check: check_https
-    hosts: ries, klecker, draghi, liszt, spohr
+    hosts: ries, klecker, draghi, liszt, spohr, widor
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1634,7 +1642,7 @@ services:
     # draghi		db.debian.org
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
-    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt
+    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt, widor
     depends: network service - https
     normal_check_interval: 60
 
@@ -1888,6 +1896,22 @@ services:
     name: DNS SOA sync - alioth.debian.org
     check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
     hosts: global
+  -
+    name: DNS SOA sync - 2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
+    check: "dsa_check_soas!2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
+    hosts: global
+  -
+    name: DNS SOA sync - a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
+    check: "dsa_check_soas!a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
+    hosts: global
+  -
+    name: DNS SOA sync - 2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa
+    check: "dsa_check_soas!2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa"
+    hosts: global
+  -
+    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: ping alive check