X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ab08a010534507bb800799a579e0527b99ba908e;hb=e24e106252116bed264c027ad7e63b4c96347bad;hp=65f096e23c8540bad59f49e49f1c22cbc13d8f1c;hpb=ebc19f20f6cd94a598842d21e54cdff705e17b32;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 65f096e..ab08a01 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -148,7 +148,7 @@ servers: hostgroups: layer3-infrastructure gw-ynic: # really janet, because ynic is stupid about firewalling - address: 146.97.71.46 + address: 144.32.255.227 parents: gw-ubcece hostgroups: layer3-infrastructure gw-zivit: @@ -216,7 +216,7 @@ servers: mipsel-aql-01: address: 141.170.6.152 parents: gw-aql - hostgroups: computers, buildd, stretch, hassrvfs, hasbootfs, sw-raid + hostgroups: computers, buildd, buster, hassrvfs, hasbootfs, sw-raid mipsel-aql-02: address: 141.170.6.153 parents: gw-aql @@ -246,7 +246,7 @@ servers: arm-arm-04: address: 217.140.96.61 parents: gw-arm - hostgroups: computers, hassrvfs, buildd, stretch, broken_mq, sw-raid + hostgroups: computers, hassrvfs, buildd, buster, broken_mq, sw-raid harris: address: 217.140.96.66 parents: gw-arm @@ -254,7 +254,7 @@ servers: hartmann: address: 217.140.96.67 parents: gw-arm - hostgroups: computers, hasbootfs, hassrvfs, stretch, armhf, buildd, broken_mq + hostgroups: computers, hasbootfs, hassrvfs, buster, armhf, buildd, broken_mq hoiby: address: 217.140.96.71 parents: gw-arm @@ -449,7 +449,7 @@ servers: lindsay: address: 5.153.231.36 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, systemd-timesyncd + hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd sor: address: 5.153.231.38 parents: ganeti-bytemark @@ -520,10 +520,6 @@ servers: address: 217.196.149.235 parents: gw-conova hostgroups: notacomputer - mirror-conova: - address: 217.196.149.229 - parents: gw-conova - hostgroups: computers, stretch, service, apache2-hosts arm-conova-01: address: 217.196.149.230 @@ -736,56 +732,56 @@ servers: hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses bendel: address: 82.195.75.100 - parents: ganeti3 - hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, stretch, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs + parents: ganeti-manda + hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, stretch, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs, systemd-timesyncd master: address: 82.195.75.110 - parents: ganeti3 - hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload + parents: ganeti-manda + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload, systemd-timesyncd vento: address: 82.195.75.98 - parents: ganeti3 - hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, heavy-exim + parents: ganeti-manda + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd draghi: address: 82.195.75.106 - parents: ganeti3 - hostgroups: computers, service, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, stretch + parents: ganeti-manda + hostgroups: computers, service, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, stretch, systemd-timesyncd geo1: address: 82.195.75.105 - parents: ganeti3 - hostgroups: computers, service, bind9-hosts, kvmdomains, stretch + parents: ganeti-manda + hostgroups: computers, service, bind9-hosts, kvmdomains, stretch, systemd-timesyncd handel: address: 82.195.75.104 - parents: ganeti3 - hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts, hassrvfs + parents: ganeti-manda + hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts, hassrvfs, systemd-timesyncd kaufmann: address: 82.195.75.107 - parents: ganeti3 - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, stretch, apache-https - ganeti3: - address: 82.195.75.111 + parents: ganeti-manda + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, stretch, apache-https, systemd-timesyncd + ganeti-manda: + address: 82.195.75.71 parents: gw-manda hostgroups: notacomputer wilder: address: 82.195.75.112 - parents: ganeti3 - hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-hosts + parents: ganeti-manda + hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-hosts, systemd-timesyncd mailly: address: 82.195.75.114 - parents: ganeti3 - hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay + parents: ganeti-manda + hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay, systemd-timesyncd denis: address: 82.195.75.91 - parents: ganeti3 - hostgroups: computers, service, kvmdomains, stretch, bind9-hosts + parents: ganeti-manda + hostgroups: computers, service, kvmdomains, stretch, bind9-hosts, systemd-timesyncd vogler: address: 82.195.75.92 - parents: ganeti3 - hostgroups: computers, service, kvmdomains, stretch + parents: ganeti-manda + hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd wolkenstein: address: 82.195.75.65 - parents: ganeti3 - hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, stretch, apache-https + parents: ganeti-manda + hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, stretch, apache-https, systemd-timesyncd mips-manda-01: address: 82.195.75.66 parents: gw-manda @@ -804,18 +800,18 @@ servers: hostgroups: computers, buildd, stretch, hassrvfs seger: address: 82.195.75.93 - parents: ganeti3 - hostgroups: computers, service, apache2-hosts, hassrvfs, rsyncd-hosts, kvmdomains, apache-https, postgres96-hosts, stretch + parents: ganeti-manda + hostgroups: computers, service, apache2-hosts, hassrvfs, rsyncd-hosts, kvmdomains, apache-https, postgres96-hosts, stretch, systemd-timesyncd suchon: address: 82.195.75.68 - parents: ganeti3 + parents: ganeti-manda hostgroups: computers, service, kvmdomains, stretch, uploadqueue, queued, systemd-timesyncd # }}} # {{{ gw-marist zani: address: 148.100.88.22 parents: gw-marist - hostgroups: computers, pybuildd, hassrvfs, stretch, incomingmailrelayed + hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed # }}} # {{{ gw-osuosl byrd: @@ -843,7 +839,7 @@ servers: ppc64el-osuosl-01: address: 140.211.166.196 parents: pijper - hostgroups: computers, hassrvfs, buildd, stretch + hostgroups: computers, hassrvfs, buildd, buster # }}} # {{{ gw-sanger sallinen: @@ -878,7 +874,7 @@ servers: mips-sil-01: address: 86.59.118.146 parents: gw-sil - hostgroups: computers, buildd, stretch, hassrvfs + hostgroups: computers, buildd, buster, hassrvfs mipsel-sil-01: address: 86.59.118.147 parents: gw-sil @@ -993,6 +989,10 @@ servers: address: 209.87.16.44 parents: ubc-gateway hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts, crazymanyprocesses + godard-pages: + address: 209.87.16.45 + parents: godard + hostgroups: notacomputer debussy: address: 209.87.16.46 parents: ubc-gateway @@ -1651,7 +1651,7 @@ services: - name: process - bacula-dir servicegroups: backup - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-dir -a '/usr/sbin/bacula-dir -f -c /etc/bacula/bacula-dir.conf'" + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-dir -a '/usr/sbin/bacula-dir -fP -c /etc/bacula/bacula-dir.conf'" hosts: dinis - name: process - bacula-fd @@ -1960,6 +1960,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: "host SSL cert - CA" + nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /srv/puppet.debian.org/ca/ca.crt" + hosts: handel - 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" @@ -2909,14 +2913,6 @@ services: check_interval: 60 hosts: vogler #### - - - name: Debian SMTP CA - nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /srv/puppet.debian.org/ca/ca.crt" - hosts: handel - check_interval: 60 - max_check_attempts: 2 - retry_interval: 5 - #### - name: puppetmaster cert nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"