From c2907bf4a52bb799b67dad37f3f960d22c1b410a Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 20 Nov 2013 20:04:15 +0000 Subject: [PATCH] bye bye wagner and vasks Signed-off-by: Stephen Gran --- config/nagios-master.cfg | 106 +++------------------------------------ 1 file changed, 7 insertions(+), 99 deletions(-) diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 291d6c8..f559ff2 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -113,12 +113,6 @@ 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 - no-servicegroups: true gw-ubcece: address: 206.12.19.254 hostgroups: layer3-infrastructure @@ -644,26 +638,6 @@ servers: parents: gw-sil hostgroups: computers, buildd, wheezy # }}} - # {{{ gw-telegraaf2 - vasks: - address: 217.196.43.140 - parents: gw-telegraaf2 - hostgroups: computers, nfs-server, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain, no-bacula, sw-raid - contact_groups: alioth-admins - no-servicegroups: true - wagner: - address: 217.196.43.132 - parents: gw-telegraaf2 - hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres91-hosts, apache-https, dl385, brokensamhain, no-bacula - contact_groups: alioth-admins - no-servicegroups: true - anonscm: - address: 217.196.43.132 - parents: wagner - contact_groups: alioth-admins - hostgroups: secondary-IPs - no-servicegroups: true - # }}} # {{{ gw-ubcece sw-ubcece: hostgroups: layer2-infrastructure @@ -1427,7 +1401,6 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'" hostgroups: computers excludehostgroups: freebsd - excludehosts: wagner, vasks - name: process - bacula-fd servicegroups: backup @@ -1477,7 +1450,6 @@ services: # name: puppet # nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml" # hostgroups: computers - # excludehosts: wagner, vasks #### - @@ -1485,13 +1457,11 @@ services: nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf" hostgroups: computers excludehostgroups: freebsd - excludehosts: vasks, wagner - name: puppetized firewall nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf" hostgroups: computers excludehostgroups: freebsd - excludehosts: vasks, wagner #### - name: ganeti - job watcher paused nrpe: "/usr/lib/nagios/plugins/negate /usr/lib/nagios/plugins/dsa-check-file -f /var/lib/ganeti/watcher.pause" @@ -1576,7 +1546,6 @@ services: servicegroups: weaksshkeys nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys" hostgroups: computers - excludehosts: wagner, vasks normal_check_interval: 60 #### - @@ -1597,7 +1566,6 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'" hostgroups: computers excludehostgroups: freebsd, armhf - excludehosts: vasks, wagner - name: process - munin-node nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'" @@ -1612,7 +1580,6 @@ services: check: check_tcp!4949 hostgroups: computers depends: process - munin-node - excludehosts: vasks, wagner ### - name: process - ntpd @@ -1652,7 +1619,6 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'" hostgroups: computers excludehostgroups: freebsd - excludehosts: vasks, wagner - name: process - syslog-ng @@ -1664,13 +1630,11 @@ services: remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$" runfrom: lotti hostgroups: computers - excludehosts: vasks, wagner - name: remote logging on lully remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$" runfrom: lully hostgroups: computers - excludehosts: vasks, wagner ### MAIL STUFF ### - @@ -1702,40 +1666,36 @@ services: name: process - clamav - clamd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u clamav -C clamd -a '/usr/sbin/clamd'" hostgroups: heavy-exim, heavy-postfix - hosts: wagner - name: service - clamav nrpe: "/usr/lib/nagios/plugins/check_clamd -H /var/run/clamav/clamd.ctl" hostgroups: heavy-exim, heavy-postfix - hosts: wagner depends: process - clamav - clamd - name: process - clamav - freshclam nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'" - hosts: wagner hostgroups: heavy-exim, heavy-postfix - name: unwanted process - clamav nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd" hostgroups: computers excludehostgroups: heavy-exim, heavy-postfix, deadslow - excludehosts: wagner - name: unwanted process - freshclam nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam" hostgroups: computers excludehostgroups: heavy-exim, heavy-postfix, deadslow - excludehosts: wagner + ### - name: process - spamd - master nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'" hostgroups: spamd - excludehosts: wagner, picconi + excludehosts: picconi excludehostgroups: deadslow - name: process - spamd - master nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'" - hosts: wagner, picconi + hosts: picconi - name: process - spamd - master nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'" @@ -1743,7 +1703,7 @@ services: - name: process - spamd - child nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'" - hosts: wagner, bendel + hosts: bendel hostgroups: spamd depends: process - spamd - master # @@ -1761,7 +1721,7 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd" hostgroups: computers excludehostgroups: spamd, deadslow - excludehosts: bendel, busoni, wagner, buxtehude + excludehosts: bendel, busoni, buxtehude ### #- @@ -1822,27 +1782,11 @@ services: hostgroups: heavy-postfix depends: process - weightd - master ### - - - name: process - weightd - master - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u Debian-exim -a 'policyd-weight (master)'" - hosts: wagner - - - name: process - weightd - cache - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u Debian-exim -a 'policyd-weight (cache)'" - hosts: wagner - depends: process - weightd - master - - - name: process - weightd - child - nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u Debian-exim -a 'policyd-weight (child)'" - hosts: wagner - depends: process - weightd - master - # - name: unwanted process - policyd-weight nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight" hostgroups: computers excludehostgroups: heavy-postfix, deadslow - excludehosts: wagner ### @@ -1932,51 +1876,43 @@ services: name: setup - dsa config nrpe: "/usr/lib/nagios/plugins/dsa-check-config" hostgroups: computers - excludehosts: wagner, vasks normal_check_interval: 60 - name: setup - local hostname etc-hosts nrpe: 'if getent ahosts `hostname` | grep -q 127.0; then echo "Warning: local hostname resolves to 127/8 address"; exit 1; else echo "OK: Hostname resolves to non-127/8 address."; exit 0; fi' hostgroups: computers - excludehosts: wagner, vasks normal_check_interval: 60 - name: setup - ud-ldap freshness nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness" - excludehosts: wagner, vasks hostgroups: computers - name: system - available entropy nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy" event_handler: dsa_event_handler_restart_ekey hostgroups: computers - excludehosts: vasks, wagner excludehostgroups: freebsd - name: system - filesystem check nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems" normal_check_interval: 60 retry_check_interval: 15 - excludehosts: wagner, vasks hostgroups: computers ### - name: local resolver nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com" hostgroups: computers - excludehosts: vasks, wagner normal_check_interval: 60 - name: process - unbound nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'" - excludehosts: vasks, wagner hostgroups: unbound-hosts, squeeze, wheezy ### - name: process - uptimed nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'" hostgroups: computers - excludehosts: vasks, wagner ### - name: unwanted process - irqbalance @@ -2008,7 +1944,7 @@ services: name: unwanted process - inetd nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd" hostgroups: computers - excludehosts: abel, alwyn, vasks + excludehosts: abel, alwyn excludehostgroups: deadslow - name: unwanted process - snmpd @@ -2058,7 +1994,7 @@ services: name: process - monit nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'" hostgroups: computers - excludehosts: vasks, wagner, quantz + excludehosts: quantz excludehostgroups: armhf - name: process - monit @@ -2172,7 +2108,6 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'" hostgroups: computers excludehostgroups: freebsd, sparc - excludehosts: vasks, wagner - name: unexpected process - ulogd nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd" @@ -2204,11 +2139,6 @@ services: # nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'" # hostgroups: bosserver # - ### - - - name: process - inetd - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C inetd -a '/usr/sbin/inetd'" - hosts: vasks ### - name: process - xinetd @@ -2332,15 +2262,6 @@ services: ### -# Alioth web URLs - - - - name: network service - loggerhead - remotecheck: "/usr/lib/nagios/plugins/check_http -H anonscm.debian.org -u /loggerhead/" - hosts: anonscm - runfrom: tchaikovsky - depends: wagner:process - apache2 - master - #### - name: process - named @@ -2448,10 +2369,6 @@ services: nrpe: "/usr/lib/nagios/plugins/dsa-check-ups" hosts: franck depends: process - UPS - nut upsd - - - name: process - pglistener - nrpe: "/usr/lib/nagios/plugins/check_procs -u pglisten -C python -a '/usr/bin/python /usr/share/pglistener/starter.py /etc/pglistener/pglistener.cfg /etc/pglistener/conf.d' -w 1: -c 1:" - hosts: wagner, vasks ### - name: process - buildd @@ -2487,15 +2404,6 @@ services: hosts: gombert contact_groups: gobby #### - - - name: network service - git - check: check_tcp!9418 - hosts: wagner - - - name: network service - svn - check: check_tcp!3690 - hosts: wagner - ### #- # name: process - tftpd # nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'" -- 2.20.1