X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b2a3568f647a929b02d9520e9229d2b27a2d0888;hb=918134dc032881c59be17ce6539ed4f2e2bb24cc;hp=21ee3352feaade4ed7895e2d6ceda4c99fd1ec29;hpb=902c570a72c8aa7e69ba4b40d3c8c6db301d48e7;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 21ee335..b2a3568 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -98,6 +98,10 @@ servers:
     address: 193.201.200.129
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-grnet:
+    address: 194.177.211.193
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
     parents: gw-HP-ftc
@@ -178,11 +182,11 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts, bind9-hosts
   raff:
     address: 192.25.206.59
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, hasvarfs, hasusrfs, hasorgfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, no-udev, hassrvfs, acpid-hosts
   merkel:
     address: 192.25.206.16
     parents: spohr
@@ -353,7 +357,7 @@ servers:
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
-    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts, bind9-hosts
   #carver:
   #  address: 128.31.0.50
   #  parents: gw-mit-csail
@@ -390,13 +394,13 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny, ntpsuckers
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, ntpsuckers
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
@@ -587,12 +591,16 @@ servers:
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs, ntpsuckers
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
     hostgroups: computers, porterbox, lenny, hassrvfs
+  zandonai:
+    address: 80.245.147.46
+    parents: gw-HP-ftc
+    hostgroups: computers, buildd, lenny, hassrvfs
 
   escher:
     address: 213.188.99.215
@@ -601,7 +609,7 @@ servers:
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny
+    hostgroups: computers, single-cpu, hasbootfs, lenny, ntpsuckers
 
   schein:
     address: 149.20.20.6
@@ -611,13 +619,23 @@ servers:
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, lenny, hassrvfs
 
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
     hostgroups: computers, buildd, lenny, sw-raid, hassrvfs, hasbootfs
 
+  grieg:
+    address: 194.177.211.200
+    parents: gw-grnet
+    hostgroups: computers, lenny
+
+  rautavaara:
+    address: 194.177.211.199
+    parents: gw-grnet
+    hostgroups: computers, lenny
+
 #############################
 # host groups
 #
@@ -796,6 +814,10 @@ hostgroups:
     # i.e. no port 25
     private: 1
 
+  ntpsuckers:
+    alias: hosts who's ntp offset is often unknown
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -893,7 +915,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: raff, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1047,7 +1069,7 @@ services:
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
-    excludehosts: zelenka
+    excludehosts: zelenka, zandonai
  ####
   -
     name: process - sshd
@@ -1131,6 +1153,7 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: zelenka, ancina
+    excludehostgroups: ntpsuckers
   #
   -
     name: network service - time
@@ -1642,7 +1665,7 @@ services:
     depends: kassia:process - apache2 - master
     hosts: kassia-sec, kassia-ftp, kassia-volatile
 
-  # keyserver on raff
+  # keyserver on kaufmann
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
@@ -1881,7 +1904,7 @@ services:
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
-    hosts: merkel, raff
+    hosts: merkel
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"