peri and penalosa run non-SMP kernels

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5707487..37a9027 100644 (file)
--- 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
@@ -520,6 +516,18 @@ servers:
     address: 137.82.84.80
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+  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:
     address: 192.168.2.6
@@ -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"
@@ -1621,7 +1629,7 @@ services:
   -
     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