From: Stephen Gran Date: Sun, 29 Apr 2012 17:24:18 +0000 (+0100) Subject: consolidate ftp checks X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=60f97640fbdc8a3fc7f479c14a819c2e34dc35b0;p=mirror%2Fdsa-nagios.git consolidate ftp checks Signed-off-by: Stephen Gran --- diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index eebfa31..f6bc8d6 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -199,7 +199,7 @@ servers: wieck: address: 195.20.242.89 parents: gw-1und1-sec - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror # }}} # {{{ gw-accumu pettersson: @@ -285,7 +285,7 @@ servers: santoro: address: 200.17.202.197 parents: gw-c3sl - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT, security_mirror contacts: faw # }}} # {{{ gw-carnet @@ -302,7 +302,7 @@ servers: gluck: address: 150.203.164.38 parents: gw-cecsit - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, security_mirror # }}} # {{{ gw-conova sompek: @@ -322,7 +322,7 @@ servers: steffani: address: 128.31.0.36 parents: gw-csail - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze, security_mirror # }}} # {{{ gw-dgi argento: @@ -441,7 +441,7 @@ servers: schein: address: 149.20.20.6 parents: gw-isc - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze, security_mirror # }}} # {{{ gw-karlsruhe zemlinsky: @@ -594,11 +594,11 @@ servers: lobos: address: 212.211.132.250 parents: gw-scanplus-lobos - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror villa: address: 212.211.132.32 parents: gw-scanplus-villa - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror # }}} # {{{ gw-sil beethoven: @@ -670,7 +670,7 @@ servers: ravel: address: 206.12.19.5 parents: sw-ubcece-kais - hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs + hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs, uploadqueue dijkstra: address: 206.12.19.218 parents: sw-ubcece-kais @@ -714,7 +714,7 @@ servers: morricone: address: 206.12.19.9 parents: sw-ubcece-kais - hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze + hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue stabile: address: 206.12.19.13 parents: sw-ubcece-kais @@ -838,7 +838,7 @@ servers: bizet: address: 206.12.19.137 parents: traetta - hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts + hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, uploadqueue lilburn: address: 206.12.19.138 parents: dijkstra @@ -859,7 +859,7 @@ servers: saens: address: 128.101.240.212 parents: gw-umn - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror # }}} # {{{ gw-utwente kassia: @@ -881,7 +881,7 @@ servers: klecker: address: 130.89.148.10 parents: gw-utwente - hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs klecker-ftp: address: 130.89.148.12 parents: klecker @@ -1045,9 +1045,6 @@ hostgroups: amavis-hosts: alias: hosts running amavis private: 1 - ftpd-hosts: - alias: hosts running vsftpd - private: 1 #tftpd-hosts: # alias: hosts running a tftpd (tftpd-hpa as a daemon) # private: 1 @@ -1142,6 +1139,9 @@ hostgroups: alias: machines with hight round trip times private: 1 + security_mirror: + alias: hosts that are security mirrors + private: 1 ############################# # servicegroups ############################# @@ -2240,20 +2240,10 @@ services: excludehostgroups: bind9-hosts #### - - - name: process - vsftp - listener - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C vsftpd -a 'vsftpd: LISTENER'" - hostgroups: ftpd-hosts, uploadqueue - excludehosts: klecker - - - name: process - vsftp - instance - nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '" - hostgroups: ftpd-hosts, uploadqueue - excludehosts: klecker - name: network service - ftp check: check_ftp - hostgroups: ftpd-hosts, uploadqueue + hostgroups: uploadqueue, security_mirror excludehosts: klecker depends: process - vsftp - listener -