X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=732a6c137b8dfcae83cccf746f466cbff3cd3980;hb=fb13a117596be088458405ca10eca6008f75671d;hp=4bbb2108f718fafe7eb41feec02c8855c7d24af1;hpb=220b77ba6108e7ea8a45afaec597c179c50bc298;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4bbb210..732a6c1 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -22,7 +22,6 @@
 #############################
 servers:
   # {{{ gateways
-  # {{{ gateways found in dsa-passwords
   global:
     hostgroups: notacomputer
     pingable: false
@@ -32,11 +31,19 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: joerg
+  gw-1und1-sec:
+    address: 212.227.120.29
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-accumu:
     address: 130.239.18.97
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-anu:
+  gw-c3sl:
+    address: 200.17.202.254
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-cecsit:
     address: 150.203.164.38
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
@@ -69,6 +76,10 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: bzed
+  gw-freenet:
+    address: 62.104.23.249
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-ftcollins:
     address: 192.25.206.1
     parents: gw-ubcece
@@ -129,10 +140,23 @@ servers:
     address: 86.59.118.145
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-telegraaf2:
+    address: 217.196.40.15
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+    contact_groups: +alioth-admins
   gw-ubcece:
     address: 206.12.19.254
     hostgroups: layer3-infrastructure
     contacts: lfilipoz
+  gw-ugent:
+    address: 193.191.17.50
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-umn:
+    address: 128.101.240.222
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-utwente:
     address: 130.89.149.1
     parents: gw-ubcece
@@ -142,45 +166,12 @@ servers:
     address: 146.97.42.26
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  # }}}
-  # {{{ gateways not found in dsa-passwords
-  gw-1und1-karlsruhe:
-    address: 212.227.120.29
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-c3sl:
-    address: 200.17.202.254
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-#  gw-esiee:
-#    address: 195.220.83.13
-#    parents: gw-ubcece
-#    hostgroups: layer3-infrastructure
-  gw-freenet:
-    address: 62.104.23.249
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-ghent:
-    address: 193.191.17.50
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-telegraaf2:
-    address: 217.196.40.15
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contact_groups: +alioth-admins
-  gw-umn.edu:
-    address: 128.101.240.222
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-zivit:
     address: 80.245.144.3
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   # }}}
-  # }}}
   # {{{ servers
-  # {{{ servers found in dsa-passwords
   # {{{ gw-1und1
   powell:
     address: 87.106.64.223
@@ -188,6 +179,28 @@ servers:
     hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, squeeze
     contacts: joerg
   # }}}
+  # {{{ gw-1und1-sec
+  schumann:
+    address: 212.227.126.54
+    parents: gw-1und1-sec
+    hostgroups: computers, acpid-hosts, service, squeeze
+  chopin:
+    address: 195.20.242.124
+    parents: schumann
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres90-hosts, squeeze
+  geo3:
+    address: 195.20.242.125
+    parents: schumann
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
+  soler:
+    address: 195.20.242.126
+    parents: schumann
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze
+  wieck:
+    address: 195.20.242.89
+    parents: gw-1und1-sec
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
+  # }}}
   # {{{ gw-accumu
   pettersson:
     address: 130.239.18.123
@@ -198,12 +211,6 @@ servers:
     parents: gw-accumu
     hostgroups: computers, buildd, hassrvfs, squeeze
   # }}}
-  # {{{ gw-anu
-  gluck:
-    address: 150.203.164.38
-    parents: gw-anu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
-  # }}}
   # {{{ gw-arm
   abel:
     address: 217.140.96.56
@@ -274,6 +281,13 @@ servers:
     parents: gw-brown
     hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
   # }}}
+  # {{{ gw-c3sl
+  santoro:
+    address: 200.17.202.197
+    parents: gw-c3sl
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
+    contacts: faw
+  # }}}
   # {{{ gw-carnet
   lebrun:
     address: 193.198.184.10
@@ -284,6 +298,12 @@ servers:
     parents: gw-carnet
     hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
   # }}}
+  # {{{ gw-cecsit
+  gluck:
+    address: 150.203.164.38
+    parents: gw-cecsit
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
+  # }}}
   # {{{ gw-conova
   sompek:
     address: 217.196.149.225
@@ -356,6 +376,12 @@ servers:
     parents: gw-ftcollins
     hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
   # }}}
+  # {{{ gw-freenet
+  pergolesi:
+    address: 62.104.23.252
+    parents: gw-freenet
+    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
+  # }}}
   # {{{ gw-grnet
   barber:
     address: 194.177.211.203
@@ -450,7 +476,7 @@ servers:
   bendel:
     address: 82.195.75.101
     parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts
   new-master:
     address: 82.195.75.110
     parents: czerny
@@ -462,7 +488,7 @@ servers:
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https, lenny
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385, acpid-hosts, apache-https, lenny
     contacts: bzed
   heininen:
     address: 82.195.75.98
@@ -497,7 +523,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -538,7 +564,7 @@ servers:
   piston:
     address: 140.211.15.154
     parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze
+    hostgroups: computers, hassrvfs, squeeze, hassrvfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -610,6 +636,18 @@ servers:
     parents: merikanto
     hostgroups: secondary-IPs
   # }}}
+  # {{{ gw-telegraaf2
+  vasks:
+    address: 217.196.43.140
+    parents: gw-telegraaf2
+    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
+    contact_groups: alioth-admins
+  wagner:
+    address: 217.196.43.132
+    parents: gw-telegraaf2
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
+    contact_groups: alioth-admins
+  # }}}
   # {{{ gw-ubcece
   sw-ubcece:
     hostgroups: layer2-infrastructure
@@ -641,10 +679,18 @@ servers:
     address: 206.12.19.218
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  pasquini:
+    address: 206.12.19.217
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
   luchesi:
     address: 206.12.19.214
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  tristano:
+    address: 206.12.19.213
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
   tchaikovsky:
     address: 206.12.19.118
     parents: luchesi
@@ -761,14 +807,14 @@ servers:
     address: 206.12.19.126
     parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts, autofs
-  dukas:
-    address: 206.12.19.128
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
-  tye:
-    address: 206.12.19.129
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
+#  dukas:
+#    address: 206.12.19.128
+#    parents: traetta
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
+#  tye:
+#    address: 206.12.19.129
+#    parents: traetta
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
   elgar:
     address: 206.12.19.130
     parents: salieri
@@ -801,6 +847,27 @@ servers:
     address: 206.12.19.137
     parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
+  lilburn:
+    address: 206.12.19.138
+    parents: dijkstra
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs
+  popov:
+    address: 206.12.19.119
+    parents: luchesi
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+  # }}}
+  # {{{ gw-ugent
+  ancina:
+    address: 157.193.39.13
+    parents: gw-ugent
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
+    contacts: luk
+  # }}}
+  # {{{ gw-umn
+  saens:
+    address: 128.101.240.212
+    parents: gw-umn
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
   # }}}
   # {{{ gw-utwente
   kassia:
@@ -850,74 +917,6 @@ servers:
     parents: gw-ynic
     hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
   # }}}
-  # }}}
-  # {{{ servers not found in dsa-passwords
-  # {{{ gw-1und1-karlsruhe
-  schumann:
-    address: 212.227.126.54
-    parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, service, squeeze
-  chopin:
-    address: 195.20.242.124
-    parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres90-hosts, squeeze
-  geo3:
-    address: 195.20.242.125
-    parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
-  soler:
-    address: 195.20.242.126
-    parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze
-  wieck:
-    address: 195.20.242.89
-    parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
-  # }}}
-  # {{{ gw-c3sl
-  santoro:
-    address: 200.17.202.197
-    parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
-    contacts: faw
-  # }}}
-   # {{{ gw-esiee
-#  lafayette:
-#    address: 147.215.7.160
-#    parents: gw-esiee
-#    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
-  # }}}
-  # {{{ gw-freenet
-  pergolesi:
-    address: 62.104.23.252
-    parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
-  # }}}
-  # {{{ gw-ghent
-  ancina:
-    address: 157.193.39.13
-    parents: gw-ghent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
-    contacts: luk
-  # }}}
-  # {{{ gw-telegraaf2
-  vasks:
-    address: 217.196.43.140
-    parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
-    contact_groups: alioth-admins
-  wagner:
-    address: 217.196.43.132
-    parents: gw-telegraaf2
-    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
-    contact_groups: alioth-admins
-  # }}}
-  # {{{ gw-umn.edu
-  saens:
-    address: 128.101.240.212
-    parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
-  # }}}
   # {{{ gw-zivit
   zandonai:
     address: 80.245.147.46
@@ -929,7 +928,6 @@ servers:
     hostgroups: computers, porterbox, hassrvfs, squeeze
   # }}}
   # }}}
-  # }}}
 
 
 #############################
@@ -1290,7 +1288,12 @@ services:
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck, heininen
+    hosts: busoni, wieck, heininen, bendel
+  -
+    name: disk usage on /var/spool/postfix
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/spool/postfix"
+    hosts: bendel
 
   #-
   #  name: disk usage on /srv/morgue.debian.org
@@ -1308,49 +1311,9 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: stabile,sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-01
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-01"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-23
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-23"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-45
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-45"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-67
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-67"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-89
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-89"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-ab
+    name: disk usage on /srv/farm-snapshot/farm-misc
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-ab"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-cd
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-cd"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-f
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-f"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-e
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-e"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
     hosts: sibelius
   -
     name: disk usage on /srv/fossology.debian.net
@@ -1757,10 +1720,19 @@ services:
   -
     name: process - amavis - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd (master)'"
-    hostgroups: amavis-hosts
+    hosts: liszt
   -
     name: process - amavis - all
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd '"
+    hosts: liszt
+    depends: process - amavis - master
+  -
+    name: process - amavis - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd-new (master)'"
+    hostgroups: amavis-hosts
+  -
+    name: process - amavis - all
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd-new '"
     hostgroups: amavis-hosts
     depends: process - amavis - master
   #
@@ -1769,6 +1741,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C amavisd-new"
     hostgroups: computers
     excludehostgroups: amavis-hosts
+    excludehosts: liszt
  ###
   -
     name: process - weightd - master
@@ -2237,6 +2210,13 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
+    excludehosts: handel
+    depends: "process - apache2 - master"
+    normal_check_interval: 120
+  -
+    name: network service - https
+    check: dsa_check_https_want_auth
+    hosts: handel
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2509,10 +2489,6 @@ services:
     name: mirror sync - security
     check: "dsa_check_mirrorsync_skew!security-nagios.debian.org!project/trace/security-master.debian.org!150:3600"
     hosts: global
-  -
-    name: mirror sync - volatile
-    check: "dsa_check_mirrorsync_skew!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org!150:3600"
-    hosts: global
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
@@ -2555,10 +2531,6 @@ services:
     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.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"