X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=892f66984e34655482dad450402ce18d583976a0;hb=8f3f7141a392e0b0643614dbfb77bb96a4b050db;hp=46b08d928c56ae6120e3a75c934508983ec50037;hpb=e9db05646d1629417ea356987ff8bfa04a7f2ab0;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 46b08d9..892f669 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -182,6 +182,10 @@ servers: address: 148.100.96.1 parents: gw-ubc hostgroups: routing-infrastructure + gw-conova: + address: 217.196.146.254 + parents: gw-ubc + hostgroups: routing-infrastructure global: hostgroups: notacomputer @@ -259,6 +263,10 @@ servers: parents: gw-man-da hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https, lenny contacts: bzed + bendel: + address: 82.195.75.101 + parents: gw-man-da + hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze heininen: address: 82.195.75.98 parents: gw-man-da @@ -314,7 +322,7 @@ servers: new-master: address: 82.195.75.110 parents: czerny - hostgroups: computers, service, hasbootfs, kvmdomains, squeeze + hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs master: address: 70.103.162.29 @@ -339,7 +347,7 @@ servers: mayer: address: 140.211.166.78 parents: gw-osuosl - hostgroups: computers, buildd, hasbootfs, lenny + hostgroups: computers, buildd, hasbootfs, squeeze # mayr: # address: 140.211.166.58 # parents: gw-osuosl @@ -361,6 +369,18 @@ servers: address: 140.211.166.16 parents: gw-osuosl hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny + parry: + address: 140.211.15.153 + parents: gw-osuosl + hostgroups: computers, hassrvfs, squeeze, buildd, hassrvfs + partch: + address: 140.211.15.152 + parents: gw-osuosl + hostgroups: computers, hassrvfs, squeeze, hassrvfs + piston: + address: 140.211.15.154 + parents: gw-osuosl + hostgroups: computers, hassrvfs, squeeze villa: address: 212.211.132.32 @@ -444,7 +464,7 @@ servers: powell: address: 87.106.64.223 parents: gw-1und1 - hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, lenny + hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, squeeze contacts: joerg schumann: @@ -476,7 +496,7 @@ servers: kassia: address: 130.89.149.224 parents: gw-utwente - hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze + hostgroups: computers, service, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze kassia-sec: address: 130.89.149.225 parents: kassia @@ -502,7 +522,7 @@ servers: ancina: address: 157.193.39.13 parents: gw-ghent - hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, lenny + hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze contacts: luk agnesi: @@ -593,7 +613,7 @@ servers: gabrielli: address: 206.12.19.17 parents: tchaikovsky - hostgroups: computers, porterbox, lenny + hostgroups: computers, porterbox, squeeze corelli: address: 206.12.19.16 parents: tchaikovsky @@ -605,7 +625,7 @@ servers: rossini: address: 206.12.19.19 parents: tchaikovsky - hostgroups: computers, dl585, acpid-hosts, service, squeeze + hostgroups: computers, dl585, acpid-hosts, service, squeeze, apache2-hosts salieri: address: 206.12.19.20 parents: tchaikovsky @@ -673,7 +693,7 @@ servers: blavet: address: 206.12.19.134 parents: traetta - hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts + hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts, nfs-client, autofs lebrun: address: 193.198.184.10 @@ -901,6 +921,11 @@ servers: parents: gw-marist hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed + sompek: + address: 217.196.146.208 + parents: gw-conova + hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc + ############################# # host groups # @@ -1083,9 +1108,6 @@ hostgroups: alias: secondary IP addresses private: 1 - smart: - alias: hosts with smartd - private: 1 hasbootfs: alias: hosts with a /boot filesystem private: 1 @@ -1526,17 +1548,17 @@ services: ### - name: process - munin-node - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'" + 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:2 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/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: process - munin-node - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin -a '/usr/sbin/munin-node'" + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin -a '/usr/sbin/munin-node'" hostgroups: armhf - name: network service - munin-node @@ -1842,6 +1864,7 @@ services: name: setup - dsa config nrpe: "/usr/lib/nagios/plugins/dsa-check-config" hostgroups: computers + excludehosts: wagner, vasks normal_check_interval: 60 - name: setup - ud-ldap freshness @@ -2169,14 +2192,8 @@ services: name: network service - http check: check_http hostgroups: apache2-hosts - excludehosts: kassia, klecker + excludehosts: klecker depends: process - apache2 - master - - - name: network service - http - check: check_http - depends: kassia:process - apache2 - master - #hosts: kassia-sec, kassia-ftp, kassia-volatile - hosts: kassia-ftp, kassia-volatile - name: network service - http check: check_http @@ -2233,28 +2250,21 @@ services: 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: kassia, klecker + 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: kassia, klecker + excludehosts: klecker - name: network service - ftp check: check_ftp hostgroups: ftpd-hosts, uploadqueue - excludehosts: kassia, klecker + excludehosts: klecker depends: process - vsftp - listener - name: network service - ftp check: check_ftp - #hosts: kassia-sec, kassia-ftp - hosts: kassia-ftp - depends: kassia:process - xinetd - - - name: network service - ftp - check: check_ftp - #hosts: kassia-sec, kassia-ftp hosts: klecker-ftp depends: klecker:process - xinetd @@ -2447,10 +2457,6 @@ services: # nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'" # hosts: paer ### - - - name: process - smartd - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C smartd -a '/usr/sbin/smartd --pidfile /var/run/smartd.pid --interval=1800'" - hostgroups: smart ############ NFS Stuff ############ ####