X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ca0cf589bf4e3aef2c100dc4fceae3ef936e0d82;hb=e38d9f67d87358d8257b364489f85b11a20d6f21;hp=6f7c847d6f8619de406d1e2ac7b207106431f34f;hpb=d35c886924c37ded936928612007a1a49a6d8900;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 6f7c847..ca0cf58 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -23,161 +23,163 @@
 servers:
   gw-man-da:
     address: 82.195.75.126
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: joerg, bzed
   gw-man-da2:
     address: 82.195.75.46
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-brainfood:
     address: 70.103.162.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-brown.edu:
     address: 128.148.34.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-osuosl:
     address: 140.211.166.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-scanplus-villa:
     address: 212.211.132.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-scanplus-lobos:
     address: 212.211.132.249
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-mit-csail:
     address: 128.31.0.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-umn.edu:
     address: 128.101.240.222
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-dg-i.net:
     address: 93.94.132.102
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: bzed
   gw-freenet:
     address: 62.104.23.249
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-sanger:
     address: 193.62.202.20
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: tjrc1, dave
   gw-1und1:
     address: 195.20.247.54
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: joerg
   gw-1und1-karlsruhe:
     address: 212.227.120.29
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-blackcat:
     address: 193.201.200.129
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-grnet:
     address: 194.177.211.193
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-utwente:
     address: 130.89.149.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   #gw-ughent:
   #  address: 157.193.39.254
-  #  parents: gw-ubc
-  #  hostgroups: routing-infrastructure
-  gw-ubc:
+  #  parents: gw-ubcece
+  #  hostgroups: layer3-infrastructure
+  sw-ubcece:
+    parents: tchaikovsky
+    hostgroups: layer2-infrastructure
+    contacts: lfilipoz
+    pingable: false
+    check_command: dsa_check_always_ok
+  gw-ubcece:
     address: 206.12.19.254
     parents: tchaikovsky
-    hostgroups: routing-infrastructure
+    hostgroups: layer3-infrastructure
     contacts: lfilipoz
   gw-carnet:
     address: 161.53.160.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-telegraaf2:
     address: 217.196.40.15
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contact_groups: +alioth-admins
   gw-helsinki:
     address: 128.214.173.25
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: holger
-  gw-cst:
-    address: 213.157.2.23
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-isc:
     address: 149.20.20.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-aca:
     address: 130.239.18.97
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
 #  gw-esiee:
 #    address: 195.220.83.13
-#    parents: gw-ubc
-#    hostgroups: routing-infrastructure
+#    parents: gw-ubcece
+#    hostgroups: layer3-infrastructure
   gw-ghent:
     address: 193.191.17.50
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-anu:
     address: 150.203.164.38
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-sil:
     address: 86.59.118.145
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-arm:
     address: 82.44.141.46
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-ynic:
     # really janet, because ynic is stupid about firewalling
     address: 146.97.42.26
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-c3sl:
     address: 200.17.202.254
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-zivit:
     address: 80.245.144.3
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-karlsruhe:
     address: 129.143.166.229
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-marist:
     address: 148.100.96.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-conova:
     address: 217.196.149.238
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -254,15 +256,11 @@ servers:
   bendel:
     address: 82.195.75.101
     parents: gw-man-da
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
     hostgroups: computers, acpid-hosts, service, squeeze, megactl
-  nielsen:
-    address: 82.195.75.99
-    parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -418,18 +416,6 @@ servers:
     parents: gw-freenet
     hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
 
-  albeniz:
-    address: 193.62.202.27
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers, lenny
-    contacts: tjrc1, dave
-  goetz:
-    address: 193.62.202.26
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, lenny
-    contacts: tjrc1, dave
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -507,20 +493,20 @@ servers:
 
   spontini:
     address: 206.12.19.14
-    parents: gw-ubc
+    parents: sw-ubcece
     hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs
   dijkstra:
     address: 206.12.19.218
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   luchesi:
     address: 206.12.19.214
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   tchaikovsky:
     address: 206.12.19.118
@@ -547,27 +533,27 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts, service, lenny
   bellini:
     address: 206.12.19.7
-    parents: gw-ubc
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, squeeze, autofs
   morricone:
     address: 206.12.19.9
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
   stabile:
     address: 206.12.19.13
-    parents: gw-ubc
+    parents: sw-ubcece
     hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
   paganini:
     address: 206.12.19.10
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
   respighi:
     address: 206.12.19.11
-    parents: gw-ubc
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
   vivaldi:
     address: 206.12.19.12
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
   # MSA 2000 (2012i)
   giustini:
@@ -587,35 +573,35 @@ servers:
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   gabrielli:
     address: 206.12.19.17
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, porterbox, squeeze
   corelli:
     address: 206.12.19.16
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, buildd, squeeze
   lucatelli:
     address: 206.12.19.15
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, buildd, squeeze
   rossini:
     address: 206.12.19.19
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   salieri:
     address: 206.12.19.20
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   traetta:
     address: 206.12.19.21
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
 #  locke:
 #    address: 206.12.19.120
-#    parents: tchaikovsky
+#    parents: sw-ubcece
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
   lotti:
     address: 206.12.19.121
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
   quantz:
     address: 206.12.19.122
@@ -707,11 +693,6 @@ servers:
     parents: gw-zivit
     hostgroups: computers, buildd, hassrvfs, squeeze
 
-  goedel:
-    address: 213.188.99.214
-    parents: gw-cst
-    hostgroups: computers, hasbootfs, ntpsuckers, buildd, lenny
-
   schein:
     address: 149.20.20.6
     parents: gw-isc
@@ -886,7 +867,7 @@ servers:
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
     contacts: faw
 
   zemlinsky:
@@ -918,9 +899,13 @@ hostgroups:
   computers:
     alias: computers
     private: 1
-  routing-infrastructure:
-    alias: Internet routers and friends
-    extinfo-icon_image: base/switch40.png
+  layer2-infrastructure:
+    alias: layer 2 devices like switches
+    extinfo-icon_image: symbols/switch.png
+    extinfo-icon_image_alt: switch
+  layer3-infrastructure:
+    alias: layer 3 devices like routers
+    extinfo-icon_image: symbols/router.png
     extinfo-icon_image_alt: router
   notacomputer:
     alias: Systems that are not really systems.  Yeah :)
@@ -1123,6 +1108,9 @@ hostgroups:
   brokensamhain:
     alias: machines that can not run samhain
     private: 1
+  high-RTT:
+    alias: machines with hight round trip times
+    private: 1
 
 #############################
 # servicegroups
@@ -1156,14 +1144,21 @@ services:
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: routing-infrastructure
+    excludehostgroups: layer3-infrastructure, high-RTT
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
+  -
+    name: PING
+    check: "check_ping!600.0,20%!900.0,40%"
+    hostgroups: high-RTT
     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
+    hostgroups: layer3-infrastructure
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1