X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=ea6dfbaa3fe8f26e4c6521b31942ebe33b1406df;hb=95b47eb1d4802dcceea0f00abb3d26fc55abda9c;hp=3d1b027b141c97e0c4864bb2c663663e1cf99124;hpb=21099fed84533b2930e9102db67e3ecfad38afc8;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3d1b027..ea6dfba 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -113,10 +113,6 @@ servers:
     address: 140.211.166.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-rapidswitch:
-    address: 193.201.200.129
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-sakura:
     address: 133.242.99.65
     parents: gw-ubcece
@@ -164,6 +160,10 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
+  ubc-gateway:
+    address: 209.87.16.254
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   # }}}
   # {{{ servers
   # {{{ gw-1und1
@@ -175,15 +175,6 @@ servers:
     address: 213.165.95.4
     parents: powell
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https
-  babin:
-    address: 213.165.95.6
-    parents: powell
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
-  piu-slave-1und1-01:
-    address: 213.165.95.7
-    parents: powell
-    hostgroups: computers, service, kvmdomains, jessie
-    contacts: holger
   # }}}
   # {{{ gw-1und1-sec
   schumann:
@@ -206,10 +197,10 @@ servers:
     hostgroups: computers, buildd, hassrvfs, jessie
   # }}}
   # {{{ gw-aql
-  etler:
+  eller:
     address: 141.170.6.156
     parents: gw-aql
-    hostgroups: computers, porterbox, jessie, hassrvfs, hasbootfs, sw-raid
+    hostgroups: computers, porterbox, jessie, hassrvfs
   mips-aql-01:
     address: 141.170.6.149
     parents: gw-aql
@@ -289,7 +280,7 @@ servers:
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, dl380, hpnewraid, jessie
+    hostgroups: computers, service, dl380, hpnewraid, jessie, hassrvfs, postgres94-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -445,10 +436,10 @@ servers:
     address: 5.153.231.25
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https
-  oyens:
+  olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, openstack-controller, broken_mq, apache2-hosts # apache-https
+    hostgroups: computers, kvmdomains, jessie
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
@@ -521,10 +512,6 @@ servers:
     contacts: faw
   # }}}
   # {{{ gw-cecsit
-  gluck:
-    address: 150.203.164.38
-    parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
@@ -543,14 +530,6 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
-  sompek:
-    address: 217.196.149.225
-    parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
-  stadler:
-    address: 217.196.149.226
-    parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
   # }}}
   # {{{ gw-csail
   steffani:
@@ -599,6 +578,10 @@ servers:
     address: 128.31.0.67
     parents: ganeti-csail
     hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https
+  pkgmirror-csail:
+    address: 128.31.0.51
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs
   # }}}
   # {{{ gw-dgi
   storace:
@@ -873,12 +856,6 @@ servers:
     parents: gw-osuosl
     hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
   # }}}
-  # {{{ gs-rapidswitch
-  caballero:
-    address: 193.201.200.200
-    parents: gw-rapidswitch
-    hostgroups: computers, buildd, sw-raid, wheezy, hassrvfs, acpid-hosts
-  # }}}
   # {{{ gw-sanger
   sibelius:
     address: 193.62.202.28
@@ -966,14 +943,6 @@ servers:
     address: 206.12.19.23
     parents: sw-ubcece-kais
     hostgroups: notacomputer
-  tchaikovsky:
-    address: 206.12.19.118
-    parents: ganeti2
-    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
-  geo2:
-    address: 206.12.19.113
-    parents: ganeti2
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -982,40 +951,10 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
-  fano:
-    address: 206.12.19.110
-    parents: ganeti2
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  finzi:
-    address: 206.12.19.111
-    parents: ganeti2
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  lucatelli:
-    address: 206.12.19.15
-    parents: sw-ubcece-kais
-    hostgroups: computers, buildd, jessie
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  lotti:
-    address: 206.12.19.121
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
-  nono:
-    address: 206.12.19.123
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs
-  reger:
-    address: 206.12.19.124
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim
-  danzi:
-    address: 206.12.19.125
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: ganeti2
@@ -1024,42 +963,106 @@ servers:
     address: 206.12.19.129
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs
-  elgar:
-    address: 206.12.19.130
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie
-  gombert:
-    address: 206.12.19.132
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https
   jenko:
     address: 206.12.19.133
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie
-  diabelli:
-    address: 206.12.19.136
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https
-  sonntag:
-    address: 206.12.19.142
+  buxtehude:
+    address: 206.12.19.147
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server
+  # }}}
+  # {{{ ubc-gateway
+  ubc-enc2bl1:
+    address: 209.87.16.1
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl2:
+    address: 209.87.16.2
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl9:
+    address: 209.87.16.9
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl10:
+    address: 209.87.16.10
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+  rachmaninoff:
+    address: 209.87.16.20
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie
+  x86-ubc-01:
+    address: 209.87.16.21
+    parents: ubc-gateway
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+  finzi:
+    address: 209.87.16.22
+    parents: ubc-gateway
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
+    contacts: christoph
+  fano:
+    address: 209.87.16.23
+    parents: ubc-gateway
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
+    contacts: christoph
+  elgar:
+    address: 209.87.16.24
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie
+  gombert:
+    address: 209.87.16.25
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https
+  nono:
+    address: 209.87.16.26
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs
+  reger:
+    address: 209.87.16.27
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim
+  diabelli:
+    address: 209.87.16.28
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost
   menotti:
-    address: 206.12.19.143
-    parents: ganeti2
+    address: 209.87.16.29
+    parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+  danzi:
+    address: 209.87.16.30
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts
+  geo2:
+    address: 209.87.16.31
+    parents: ubc-gateway
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+  lotti:
+    address: 209.87.16.32
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   muffat:
-    address: 206.12.19.146
-    parents: ganeti2
+    address: 209.87.16.33
+    parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
-  buxtehude:
-    address: 206.12.19.147
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server
+  sonntag:
+    address: 209.87.16.34
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
+  tchaikovsky:
+    address: 206.87.16.35
+    parents: ubc-gateway
+    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
+  gretchaninov:
+    address: 206.87.16.36
+    parents: ubc-gateway
+    hostgroups: computers, general, kvmdomains, jessie, hassrvfs
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1468,7 +1471,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, busoni, buxtehude, lw07
+    hosts: sibelius, busoni, buxtehude, lw07, fasolo
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1518,7 +1521,7 @@ services:
     name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /srv/ftp-master.debian.org"
-    hosts: franck
+    hosts: franck, fasolo
   -
     name: disk usage on /storage/snapshot-farm-1
     servicegroups: diskspace
@@ -1582,11 +1585,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: prokofiev, pieta
+    excludehosts: prokofiev, pieta, ubc-enc2bl1, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
   -
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-    hosts: prokofiev, pieta
+    hosts: prokofiev, pieta, ubc-enc2bl1, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
   -
     name: swap usage - percent
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
@@ -2057,7 +2060,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
     hostgroups: dl380, dl360, bl460, dl180
-    excludehosts: schein
+    excludehosts: schein, busoni
     excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
@@ -2070,7 +2073,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
-    hosts: schein
+    hosts: schein, busoni
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2412,7 +2415,7 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: klecker, oyens
+    excludehosts: klecker
     depends: process - apache2 - master
   -
     name: network service - http
@@ -2611,7 +2614,7 @@ services:
     servicegroups: mirror
   -
     name: mirror static sync - network-test
-    check: "dsa_check_staticsync!network-test.debian.org"
+    check: "dsa_check_staticsync_nossl!network-test.debian.org"
     hosts: global
     servicegroups: mirror
   -
@@ -2636,7 +2639,7 @@ services:
     servicegroups: mirror
   -
     name: mirror static sync - debdeltas
-    check: "dsa_check_staticsync!debdeltas.debian.net"
+    check: "dsa_check_staticsync_nossl!debdeltas.debian.net"
     hosts: global
     servicegroups: mirror
   -
@@ -2651,17 +2654,17 @@ services:
     servicegroups: mirror
   -
     name: mirror static sync - mozilla
-    check: "dsa_check_staticsync!mozilla.debian.net"
+    check: "dsa_check_staticsync_nossl!mozilla.debian.net"
     hosts: global
     servicegroups: mirror
   -
     name: mirror static sync - news
-    check: "dsa_check_staticsync!news.debian.org"
+    check: "dsa_check_staticsync!news.debian.net"
     hosts: global
     servicegroups: mirror
   -
     name: mirror static sync - incoming.ports
-    check: "dsa_check_staticsync!incoming.ports.debian.org"
+    check: "dsa_check_staticsync_nossl!incoming.ports.debian.org"
     hosts: global
     servicegroups: mirror
  # -
@@ -2701,17 +2704,17 @@ services:
     servicegroups: mirror
   -
     name: mirror static sync - incoming
-    check: "dsa_check_staticsync!incoming.debian.org"
+    check: "dsa_check_staticsync_nossl!incoming.debian.org"
     hosts: global
     servicegroups: mirror
   -
     name: mirror static sync - metadata.ftp-master
-    check: "dsa_check_staticsync!metadata.ftp-master.debian.org"
+    check: "dsa_check_staticsync_nossl!metadata.ftp-master.debian.org"
     hosts: global
     servicegroups: mirror
   -
     name: mirror static sync - deb
-    check: "dsa_check_staticsync!deb.debian.org"
+    check: "dsa_check_staticsync_nossl!deb.debian.org"
     hosts: global
     servicegroups: mirror