X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=bb6d5d49ac8e215d58d9c2fc20fcd4253ffea0ee;hb=a3a88473866e00e9a936f36a5bb677774ab17425;hp=2e6b5393073369e91c90a48066cddbba2757d2c8;hpb=efa7c15b14ae0f61eded811bb0016673a0683482;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 2e6b539..bb6d5d4 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -403,7 +403,7 @@ servers:
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -421,7 +421,7 @@ servers:
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
@@ -453,7 +453,7 @@ servers:
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
@@ -586,14 +586,6 @@ servers:
     parents: gw-bytemark
     hostgroups: notacomputer
 
-  falla:
-    address: 128.31.0.65
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie, jessie-freebsd
-  fischer:
-    address: 128.31.0.35
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
@@ -655,7 +647,7 @@ servers:
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, xinetd-hosts, systemd-timesyncd
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
@@ -719,11 +711,15 @@ servers:
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+  lw09:
+    address: 185.17.185.181
+    parents: gw-leaseweb
+    hostgroups: computers, service, stretch, dl180
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -749,16 +745,6 @@ servers:
     address: 82.195.75.110
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload
-  fils:
-    address: 82.195.75.89
-    parents: ganeti3
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  fayrfax:
-    address: 82.195.75.82
-    parents: ganeti3
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
   vento:
     address: 82.195.75.98
     parents: ganeti3
@@ -839,11 +825,6 @@ servers:
     hostgroups: computers, buildd, hassrvfs, stretch, incomingmailrelayed
   # }}}
   # {{{ gw-osuosl
-  busoni:
-    address: 140.211.166.202
-    parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, jessie, hasvarlogfs, apache2-hosts, no-bacula, apache-https
-
   byrd:
     address: 140.211.166.200
     parents: gw-osuosl
@@ -865,10 +846,6 @@ servers:
     address: 140.211.166.197
     parents: pieta
     hostgroups: computers, hassrvfs, buildd, jessie
-  pizzetti:
-    address: 140.211.166.198
-    parents: pieta
-    hostgroups: computers, jessie, hassrvfs, porterbox
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
@@ -920,66 +897,6 @@ servers:
     parents: gw-skroutz1, gw-skroutz2
     hostgroups: computers, stretch, service, sw-raid, hassrvfs, apache2-hosts
   # }}}
-  # {{{ gw-ubcece
-  sw-ubcece:
-    hostgroups: layer2-infrastructure
-    contacts: lfilipoz
-    pingable: false
-    check_command: dsa_check_always_ok
-  sw-ubcece-mcld:
-    hostgroups: layer2-infrastructure
-    parents: sw-ubcece
-    contacts: lfilipoz
-    pingable: false
-    check_command: dsa_check_always_ok
-  sw-ubcece-kais:
-    hostgroups: layer2-infrastructure
-    parents: sw-ubcece
-    contacts: lfilipoz
-    pingable: false
-    check_command: dsa_check_always_ok
-  spontini:
-    address: 206.12.19.14
-    parents: sw-ubcece-mcld
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
-    contacts: lfilipoz
-  ubc-bl7:
-    address: 206.12.19.217
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl6:
-    address: 206.12.19.216
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl2:
-    address: 206.12.19.212
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl3:
-    address: 206.12.19.213
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl4:
-    address: 206.12.19.214
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl8:
-    address: 206.12.19.218
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  # MSA 2000 (2012i)
-  giustini:
-    address: 192.168.2.6
-    parents: sw-ubcece-kais
-    hostgroups: notacomputer
-    # unless we implement runfrom for host alive checks
-    pingable: false
-    check_command: dsa_check_always_ok
-#  locke:
-#    address: 206.12.19.120
-#    parents: sw-ubcece-kais
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  # }}}
   # {{{ ubc-gateway
   ubc-enc2bl01:
     address: 209.87.16.1
@@ -1071,7 +988,7 @@ servers:
   tye:
     address: 209.87.16.37
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ullmann:
     address: 209.87.16.38
     parents: ubc-gateway
@@ -1096,7 +1013,7 @@ servers:
   debussy:
     address: 209.87.16.46
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1195,10 +1112,6 @@ hostgroups:
     extinfo-icon_image: base/debian.png
     extinfo-icon_image_alt: Debian GNU/Linux
     extinfo-notes_url: https://db.debian.org/machines.cgi?host=%s
-  layer2-infrastructure:
-    alias: Layer 2 Devices
-    extinfo-icon_image: base/switch40.png
-    extinfo-icon_image_alt: switch
   layer3-infrastructure:
     alias: Layer 3 Devices
     extinfo-icon_image: base/switch40.png
@@ -1258,8 +1171,6 @@ hostgroups:
     alias: Hosts running wheezy
   jessie:
     alias: Hosts running jessie
-  jessie-freebsd:
-    alias: kFreebsd hosts running jessie
   stretch:
     alias: Hosts running stretch
 
@@ -1489,7 +1400,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, fasolo
+    hosts: sibelius, buxtehude, lw07, fasolo
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1655,10 +1566,6 @@ services:
     hostgroups: computers
     excludehosts: zelenka, zandonai
     excludehostgroups: jessie, stretch
-  -
-    name: process - getty
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/getty"
-    hostgroups: jessie-freebsd
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
@@ -1938,9 +1845,7 @@ services:
   -
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
-    #hosts: casulana
     hostgroups: computers
-    #excludehostgroups: single-cpu, freebsd
     excludehostgroups: freebsd
     excludehosts: harris, smetana
   ###
@@ -2046,13 +1951,7 @@ services:
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
     hostgroups: computers
     excludehostgroups: freebsd, alioth
-    excludehosts: czerny, grnet-node01, storace, ubc-bl2
-  ###
-  -
-    name: process - rngd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd -a '/usr/sbin/rngd -r /dev/hwrng'"
-    hostgroups: kvmdomains
-    excludehostgroups: stretch
+    excludehosts: czerny, grnet-node01, storace
   # }}}
   # {{{ anti-services
   -
@@ -2153,12 +2052,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
     check_interval: 120
     hostgroups: bm-bl
-  -
-    name: HW - hpacucli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
-    check_interval: 120
-    hosts: busoni
   ###
 #  -
 #    name: HW - edac status
@@ -2209,12 +2102,6 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
-    excludehosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
-  -
-    name: RAID - DRBD
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All --ok-no-devices"
-    hosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2224,7 +2111,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts, mail-relay
-    excludehosts: master, busoni, quantz, buxtehude
+    excludehosts: master, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
@@ -2234,11 +2121,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, quantz, buxtehude
+    excludehosts: master, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, busoni, quantz, buxtehude
+    hosts: master, quantz, buxtehude
   -
     name: mail queue
     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
@@ -2308,7 +2195,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: bendel, busoni
+    excludehosts: bendel
 
   -
     name: unwanted process - greylistd
@@ -2572,14 +2459,14 @@ services:
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
-    hosts: fano, finzi, fils, fayrfax
+    hosts: fano, finzi
     contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: fano, finzi, fils, fayrfax
+    excludehosts: fano, finzi
     contact_groups: buildd
   -
     name: processes - zombie schroot
@@ -2926,25 +2813,6 @@ services:
     runfrom: denis
   # }}}
   # {{{ storage
-  -
-    name: ping alive check
-    remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
-    runfrom: ubc-bl8
-    hosts: giustini
-    check_interval: 5
-    max_check_attempts: 4
-    retry_interval: 1
-  -
-    name: Overall Unit Status
-    remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
-    runfrom: ubc-bl8
-    hosts: giustini
-  -
-    name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=11298 $HOSTADDRESS$ public"
-    runfrom: ubc-bl8
-    hosts: giustini
-  ###
   -
     name: process - multipathd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:15 -c 1: -u root -C multipathd -a '/sbin/multipathd'"
@@ -3079,3 +2947,5 @@ services:
 # }}}
 
 # vim: set ts=2 sw=2 et ai si fdm=marker:
+
+