X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0a0f192a15f2bfb9257dbf037882d0fd04e2afc3;hb=ee93752787709813806ead6ec2137c825d4d095f;hp=25faf67ae771f736657e2cd22e18bdbb44d5c3c8;hpb=512001796746b0daa99691df013756fa44f4ae37;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 25faf67..0a0f192 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -386,6 +386,10 @@ servers: address: 5.153.231.11 parents: ganeti-bytemark hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts + backuphost: + address: 5.153.231.12 + parents: ganeti-bytemark + hostgroups: computers, hassrvfs, kvmdomains, jessie philp: address: 5.153.231.13 parents: ganeti-bytemark @@ -459,7 +463,7 @@ servers: gideon: address: 5.153.231.34 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https + hostgroups: computers, service, kvmdomains, jessie, hassrvfs httpredir-bm-01: address: 5.153.231.35 parents: ganeti-bytemark @@ -618,6 +622,14 @@ servers: address: 194.177.211.203 parents: ganeti-grnet hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie + gigault: + address: 194.177.211.204 + parents: ganeti-grnet + hostgroups: computers, service, hassrvfs, kvmdomains, jessie + vittoria: + address: 194.177.211.205 + parents: ganeti-grnet + hostgroups: computers, service, hassrvfs, kvmdomains, jessie # }}} # {{{ gw-isc schein: @@ -629,19 +641,19 @@ servers: lw01: address: 185.17.185.177 parents: gw-leaseweb - hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server + hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts lw02: address: 185.17.185.178 parents: gw-leaseweb - hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server + hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts lw03: address: 185.17.185.179 parents: gw-leaseweb - hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server + hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts lw04: address: 185.17.185.180 parents: gw-leaseweb - hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server + hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts lw07: address: 185.17.185.187 parents: gw-leaseweb @@ -801,10 +813,6 @@ servers: parents: pieta hostgroups: computers, jessie, hassrvfs, porterbox # malo TODO - mayer: - address: 140.211.166.78 - parents: gw-osuosl - hostgroups: computers, buildd, hasbootfs, jessie # mayr: # address: 140.211.166.58 # parents: gw-osuosl @@ -861,10 +869,6 @@ servers: address: 86.59.118.151 parents: gw-sil hostgroups: computers, porterbox, jessie, hassrvfs - eysler: - address: 86.59.118.152 - parents: gw-sil - hostgroups: computers, buildd, jessie eberlin: address: 86.59.118.155 parents: gw-sil @@ -925,10 +929,6 @@ servers: address: 206.12.19.118 parents: ganeti2 hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie - brahms: - address: 206.12.19.115 - parents: ganeti2 - hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie geo2: address: 206.12.19.113 parents: ganeti2 @@ -951,14 +951,6 @@ servers: parents: ganeti2 hostgroups: computers, freebsd, jessie, buildd, hassrvfs contacts: christoph - gabrielli: - address: 206.12.19.17 - parents: sw-ubcece-kais - hostgroups: computers, porterbox, jessie - corelli: - address: 206.12.19.16 - parents: sw-ubcece-kais - hostgroups: computers, buildd, jessie lucatelli: address: 206.12.19.15 parents: sw-ubcece-kais @@ -1003,7 +995,7 @@ servers: address: 206.12.19.132 parents: ganeti2 hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https - jenkins: + jenko: address: 206.12.19.133 parents: ganeti2 hostgroups: computers, service, kvmdomains, jessie @@ -1498,7 +1490,7 @@ services: - name: disk usage on /srv/ftp-master.debian.org servicegroups: diskspace - nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org" + nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /srv/ftp-master.debian.org" hosts: franck - name: disk usage on /storage/snapshot-farm-1 @@ -1615,7 +1607,7 @@ services: servicegroups: backup nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup" hostgroups: computers - excludehosts: storace + excludehosts: backuphost, storace, backuphost normal_check_interval: 60 max_check_attempts: 2 retry_check_interval: 5 @@ -1623,7 +1615,7 @@ services: name: backup server config servicegroups: backup nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server" - hosts: storace + hosts: backuphost, storace, backuphost normal_check_interval: 60 max_check_attempts: 2 retry_check_interval: 5 @@ -1981,6 +1973,10 @@ services: name: "host SSL cert - debian client" nrpe: "if [ -e /etc/ssl/debian/certs/thishost.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost.crt; else echo 'No thishost.crt on this host.'; fi" hostgroups: computers + - + name: "sso CRL" + nrpe: "if [ -e /var/lib/dsa/sso/ca.crl ]; then /usr/lib/nagios/plugins/dsa-check-crl-expire -w 129600 -c 86400 /var/lib/dsa/sso/ca.crl; else echo 'No sso/ca.crl on this host.'; fi" + hostgroups: computers # }}} # {{{ HW health/raid - @@ -2340,6 +2336,12 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -a /usr/sbin/apache2" hostgroups: apache2-hosts depends: process - apache2 - master + excludehosts: klecker + - + name: process - apache2 - worker + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:80 -c 1:150 -u www-data -a /usr/sbin/apache2" + hosts: klecker + depends: process - apache2 - master - name: unwanted process - apache2 nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2" @@ -2432,7 +2434,7 @@ services: - name: postgresql backups nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg" - hosts: storace + hosts: storace, backuphost # }}} # {{{ power # - @@ -2574,6 +2576,22 @@ services: name: DNS SOA sync - alioth.debian.org check: "dsa_check_soas_add!denis.debian.org!alioth.debian.org" hosts: global + - + name: DNS SOA sync - debconf.net + check: "dsa_check_soas_add!denis.debian.org!debconf.net" + hosts: global + - + name: DNS SOA sync - debconf.org + check: "dsa_check_soas_add!denis.debian.org!debconf.org" + hosts: global + - + name: DNS SOA sync - debianday.org + check: "dsa_check_soas_add!denis.debian.org!debianday.org" + hosts: global + - + name: DNS SOA sync - dpkg.org + check: "dsa_check_soas_add!denis.debian.org!dpkg.org" + hosts: global - name: DNS - delegation and signature expiry hosts: global