X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=7ea069c6240bd3060c7e15950d60283cbd80d08c;hb=4826f01dd77fbcbd97be4109401ca156f3673c14;hp=cdc97dd7da15eb2c9875f4f3c5a65ace730451d1;hpb=9eeb1e4886bbb2f6b46494856e5ddefc11865794;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index cdc97dd..7ea069c 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 @@ -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 @@ -860,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 @@ -1006,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 @@ -1031,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: @@ -1189,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 @@ -1564,14 +1544,6 @@ services: name: processes - total hostgroups: manyprocesses nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700" - - - name: swap usage - percent - nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%" - hostgroups: computers - - - name: swap usage - mb - nrpe: "/usr/lib/nagios/plugins/check_swap -w 20000 -c 5000" - hostgroups: computers - name: free memory - mb nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m mb" @@ -1586,10 +1558,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" @@ -1976,12 +1944,6 @@ services: hostgroups: computers excludehostgroups: freebsd, alioth excludehosts: czerny, grnet-node01, storace - ### - - - 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 # }}} # {{{ anti-services - @@ -2489,14 +2451,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 @@ -2977,3 +2939,5 @@ services: # }}} # vim: set ts=2 sw=2 et ai si fdm=marker: + +