From cf4fa89410fb6bf6ee94d97a6cf04f2e3b61e295 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Fri, 2 Feb 2018 18:27:37 +0100 Subject: [PATCH] Decommission fano and finzi --- config/nagios-master.cfg | 71 +++++----------------------------------- 1 file changed, 9 insertions(+), 62 deletions(-) diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 7ea069c..e1b2c35 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -923,16 +923,6 @@ servers: address: 209.87.16.21 parents: ubc-gateway hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd - 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 @@ -1119,10 +1109,6 @@ hostgroups: notacomputer: alias: Systems that are not really systems. Yeah :) private: 1 - freebsd: - alias: freebsd - private: 1 - extinfo-icon_image_alt: Debian GNU/kFreeBSD armhf: alias: armhf private: 1 @@ -1562,7 +1548,6 @@ services: name: process - getty nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty" hostgroups: jessie, stretch - excludehostgroups: freebsd - name: processes - zombies @@ -1573,7 +1558,6 @@ services: nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy" event_handler: dsa_event_handler_restart_ekey hostgroups: computers - excludehostgroups: freebsd - name: system - filesystem check nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems" @@ -1627,12 +1611,7 @@ services: servicegroups: backup 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, alioth - - - name: process - bacula-fd - servicegroups: backup - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'" - hostgroups: freebsd + excludehostgroups: alioth - name: network backup status - draghi @@ -1671,7 +1650,6 @@ services: servicegroups: security nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs" hostgroups: computers - excludehostgroups: freebsd check_interval: 60 retry_interval: 15 notification_interval: 10080 @@ -1679,26 +1657,23 @@ services: name: installed firewall nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf" hostgroups: computers - excludehostgroups: freebsd - name: puppetized firewall nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf" hostgroups: computers - excludehostgroups: freebsd - name: process - ulogd 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, jessie, stretch + excludehostgroups: sparc, jessie, stretch - name: process - ulogd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ulog -C ulogd -a '/usr/sbin/ulogd --daemon --uid ulog'" hostgroups: jessie, stretch - excludehostgroups: freebsd - name: unexpected process - ulogd nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd" - hostgroups: freebsd, sparc + hostgroups: sparc #### - name: process - samhain @@ -1726,16 +1701,11 @@ services: name: process - syslog-ng 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, jessie, stretch - - - name: process - syslog-ng - nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'" - hostgroups: freebsd + excludehostgroups: jessie, stretch - name: process - syslog-ng nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng -a '/sbin/syslog-ng -F'" hostgroups: jessie, stretch - excludehostgroups: freebsd - name: remote logging on lotti @@ -1793,11 +1763,6 @@ services: name: process - munin-node nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'" hostgroups: computers - excludehostgroups: freebsd - - - 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'" - hostgroups: freebsd - name: network service - munin-node check: check_tcp!4949 @@ -1821,7 +1786,7 @@ services: name: system time synced nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl -s" hostgroups: computers - excludehostgroups: systemd-timesyncd, freebsd, wheezy + excludehostgroups: systemd-timesyncd, wheezy servicegroups: time - name: system time synced @@ -1838,7 +1803,6 @@ services: name: process - irqbalance nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'" hostgroups: computers - excludehostgroups: freebsd excludehosts: harris, smetana ### - @@ -1850,11 +1814,7 @@ services: name: process - ud-replicated nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C ud-replicated -a '/usr/bin/python /usr/bin/ud-replicated'" hostgroups: computers - excludehostgroups: freebsd, alioth - - - name: process - ud-replicated - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C python2.7 -a '/usr/bin/python /usr/bin/ud-replicated'" - hostgroups: freebsd + excludehostgroups: alioth ### - name: process - monit @@ -1901,16 +1861,11 @@ services: name: process - udevd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C udevd -a 'udevd'" hostgroups: computers - excludehostgroups: freebsd, jessie, stretch + excludehostgroups: jessie, stretch - name: process - udevd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C systemd-udevd -a '/lib/systemd/systemd-udevd'" hostgroups: jessie, stretch - excludehostgroups: freebsd - - - name: unexpected process - udev - nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd" - hostgroups: freebsd ### - name: process - acpid @@ -1937,12 +1892,12 @@ services: name: process - stunnel4 - puppet-ekeyd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'" hostgroups: wheezy, jessie, stretch - excludehostgroups: freebsd, alioth + excludehostgroups: alioth - name: process - stunnel4 - puppet-ekeyd is crazy nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity" hostgroups: computers - excludehostgroups: freebsd, alioth + excludehostgroups: alioth excludehosts: czerny, grnet-node01, storace # }}} # {{{ anti-services @@ -2447,18 +2402,11 @@ services: hosts: storace, backuphost # }}} # {{{ buildd - - - 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 - 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 contact_groups: buildd - name: processes - zombie schroot @@ -2870,7 +2818,6 @@ services: name: system - all services running nrpe: "/usr/bin/sudo /bin/systemctl is-system-running" hostgroups: jessie, stretch - excludehostgroups: freebsd ### - name: process - slapd -- 2.20.1