X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=3ed8092ef6fa71f899783f5ede386d4b47d4a17c;hb=65749b382591500b749a17d3ad0963c4283794dd;hp=70a72057b551aa42f6083a70f0fe645ee1f5b736;hpb=98483786a056b988d7ece58643e9d4d1e5cacc79;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 70a7205..3ed8092 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -185,13 +185,17 @@ servers: merkel: address: 192.25.206.16 parents: spohr - hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny + hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny + merkel2: + address: 192.25.206.71 + parents: merkel + hostgroups: secondary-IPs spohr: address: 192.25.206.33 hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim spohr2: address: 192.25.206.38 - parents: rietz + parents: spohr hostgroups: secondary-IPs peri: address: 192.25.206.15 @@ -201,7 +205,7 @@ servers: penalosa: address: 192.25.206.68 parents: spohr - hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny + hostgroups: computers, buildd, sw-raid, hasbootfs, lenny contacts: dannf mundy: address: 192.25.206.62 @@ -254,15 +258,15 @@ servers: unger: address: 82.195.75.102 parents: gw-man-da - hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny + hostgroups: computers, service, dl360, acpid-hosts, lenny handel: address: 82.195.75.104 parents: unger - hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs + hostgroups: computers, service, acpid-hosts, lenny, hasbootfs geo1: address: 82.195.75.105 parents: unger - hostgroups: computers, service, acpid-hosts, lenny, hasbootfs + hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, bind9-hosts draghi: address: 82.195.75.106 parents: unger @@ -319,15 +323,15 @@ servers: mahler: address: 128.31.0.46 parents: gw-mit-csail - hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts + hostgroups: computers, single-cpu, lenny, porterbox rore: address: 128.31.0.49 parents: gw-mit-csail - hostgroups: computers, service, rsyslog-hosts, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts + hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts carver: address: 128.31.0.50 parents: gw-mit-csail - hostgroups: computers, service, rsyslog-hosts, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts + hostgroups: computers, service, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts klecker: address: 194.109.137.218 @@ -348,7 +352,7 @@ servers: widor: address: 93.94.130.161 parents: gw-dg-i.net - hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, rsyslog-hosts, acpid-hosts + hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, acpid-hosts contacts: bzed pergolesi: @@ -388,7 +392,7 @@ servers: puccini: address: 87.106.4.56 parents: gw-1und1 - hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts, hassrvfs + hostgroups: computers, buildd, lenny, ulogd-hosts, hassrvfs contacts: joerg powell: address: 87.106.64.223 @@ -407,11 +411,11 @@ servers: chopin: address: 195.20.242.124 parents: schumann - hostgroups: computers, ulogd-hosts, lenny, rsyslog-hosts, hassrvfs + hostgroups: computers, ulogd-hosts, lenny, hassrvfs geo3: address: 195.20.242.125 parents: schumann - hostgroups: computers, service, lenny, hasbootfs, rsyslog-hosts, single-cpu + hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts caballero: address: 193.201.200.200 @@ -477,7 +481,7 @@ servers: dijkstra: address: 137.82.84.70 parents: gw-ubc - hostgroups: computers, bl460, rsyslog-hosts, acpid-hosts, lenny + hostgroups: computers, bl460, acpid-hosts, lenny brahms: address: 137.82.84.74 parents: dijkstra @@ -485,7 +489,7 @@ servers: geo2: address: 137.82.84.71 parents: dijkstra - hostgroups: computers, service, lenny, hasbootfs, rsyslog-hosts, single-cpu + hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts duarte: address: 137.82.84.77 parents: dijkstra @@ -494,7 +498,7 @@ servers: lebrun: address: 193.198.184.10 parents: gw-carnet - hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts + hostgroups: computers, buildd, sw-raid, lenny schroeder: address: 193.198.184.11 parents: gw-carnet @@ -538,12 +542,12 @@ servers: schein: address: 149.20.20.6 parents: gw-isc - hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, dl360, bind9-hosts + hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, dl360, bind9-hosts praetorius: address: 130.239.18.121 parents: gw-aca - hostgroups: computers, buildd, rsyslog-hosts, lenny + hostgroups: computers, buildd, lenny lafayette: address: 147.215.7.160 @@ -623,9 +627,9 @@ hostgroups: #syslog-ng-hosts: # alias: hosts running syslog-ng instead of sysklogd # private: 1 - rsyslog-hosts: - alias: hosts running rsyslogd instead of sysklogd - private: 1 + #rsyslog-hosts: + # alias: hosts running rsyslogd instead of sysklogd + # private: 1 postfix-hosts: alias: hosts running postfix instead of exim private: 1 @@ -638,9 +642,6 @@ hostgroups: apache2-hosts: alias: hosts running apache2 private: 1 - apache1-hosts: - alias: hosts running apache1 - private: 1 bind9-hosts: alias: hosts running bind9 private: 1 @@ -892,7 +893,7 @@ services: - name: puppet - nrpe: "/usr/lib/nagios/plugins/dsa-check-puppet" + nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -f /var/lib/puppet/state/state.yaml" hostgroups: lenny excludehosts: agnesi @@ -1075,27 +1076,26 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C cron -a /usr/sbin/cron" hostgroups: computers - ### - # - - # 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: syslog-ng-hosts ### - - name: process - rsyslogd - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd -a '/usr/sbin/rsyslogd -c3'" - hostgroups: rsyslog-hosts + 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: lenny + excludehosts: agnesi + ### + # - + # name: process - rsyslogd + # nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd -a '/usr/sbin/rsyslogd -c3'" + # hostgroups: rsyslog-hosts ### - name: process - syslogd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd -a '/sbin/syslogd'" - hostgroups: computers - excludehostgroups: rsyslog-hosts + hosts: rietz, verdi - name: process - klogd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd -a '/sbin/klogd -x'" - hostgroups: computers - excludehostgroups: rsyslog-hosts + hosts: rietz, verdi ### MAIL STUFF ### @@ -1577,6 +1577,7 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2" hostgroups: apache2-hosts depends: process - apache2 - master + - name: network service - http check: check_http @@ -1590,37 +1591,42 @@ services: hosts: kassia-sec, kassia-ftp + # apache1 process on merkel - name: process - apache - master nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache" - hostgroups: apache1-hosts + hosts: merkel - name: process - apache - worker nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache" - hostgroups: apache1-hosts - depends: process - apache - master - - - name: network service - http - check: check_http - hostgroups: apache1-hosts + hosts: merkel depends: process - apache - master + # keyserver on raff - name: network service - http keyserver check: dsa_check_http_port!11371 hosts: raff depends: process - apache2 - master + # https on various hosts - name: network service - https check: check_https - hosts: ries, klecker, draghi + hosts: ries, klecker, draghi, liszt, spohr depends: "process - apache2 - master" normal_check_interval: 120 - name: network service - https cert check: dsa_check_cert!443 - hosts: ries, klecker, spohr2, draghi + # ries ftp-master.debian.org + # klecker security-master.debian.org + # spohr rt.debian.org + # spohr2 nagios.debian.org + # draghi db.debian.org + # merkel2 nm.debian.org + # liszt lists.debian.org + hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt depends: network service - https normal_check_interval: 60 @@ -1636,6 +1642,18 @@ services: check: check_http hosts: spohr2 depends: "spohr:process - apache2 - master" + # merkel + - + name: network service - https + check: check_https + hosts: merkel2 + depends: "merkel:process - apache2 - master" + normal_check_interval: 120 + - + name: network service - http + check: check_http + hosts: merkel2 + depends: "merkel:process - apache2 - master" #### - name: process - named @@ -1819,6 +1837,10 @@ services: ############ MISC OTHER Stuff ############ ##### + - + name: mirror sync - bugs + check: "dsa_check_mirrorsync!bugs.debian.org!project/trace/bugs-master.debian.org" + hosts: global - name: mirror sync - security check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"