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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index aa54c0b..586be17 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
@@ -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
@@ -817,7 +813,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 +910,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 +927,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 +1368,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"
@@ -1621,7 +1617,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, klecker, draghi, liszt, spohr
+    hosts: ries, klecker, draghi, liszt, spohr, tartini
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1634,7 +1630,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, tartini
     depends: network service - https
     normal_check_interval: 60