X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=363e1593fcd163c24a7d1a8baed5996e6e26c418;hb=e88536af180f92dee0a035de9fce7e3b6ecf2bb8;hp=664afd8d92df3b221a470554b0c6a968f94f1e77;hpb=838803e155d783697b4559012bde63eff478d8ed;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 664afd8..363e159 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -524,22 +524,6 @@ servers: address: 217.196.149.229 parents: gw-conova hostgroups: computers, stretch, service, apache2-hosts - mirror-conova-debian: - address: 217.196.149.232 - hostgroups: secondary-IPs - parents: mirror-conova - mirror-conova-security: - address: 217.196.149.233 - hostgroups: secondary-IPs, rsyncd-hosts, security_mirror - parents: mirror-conova - mirror-conova-archive: - address: 217.196.149.234 - hostgroups: secondary-IPs, rsyncd-hosts - parents: mirror-conova - mirror-conova-syncproxy4-eu: - address: 217.196.149.237 - hostgroups: secondary-IPs, rsyncd-hosts, https-service - parents: mirror-conova arm-conova-01: address: 217.196.149.230 @@ -553,6 +537,27 @@ servers: address: 217.196.149.236 parents: ganeti-conova hostgroups: computers, hassrvfs, porterbox, stretch + + schmelzer: + address: 185.69.161.161 + parents: gw-conova + hostgroups: computers, service, stretch, r540, manyprocesses, apache2-hosts, apache-https, systemd-timesyncd + schmelzer-debian: + address: 217.196.149.232 + hostgroups: secondary-IPs + parents: schmelzer + schmelzer-security: + address: 217.196.149.233 + hostgroups: secondary-IPs, rsyncd-hosts, security_mirror + parents: schmelzer + schmelzer-archive: + address: 217.196.149.234 + hostgroups: secondary-IPs, rsyncd-hosts + parents: schmelzer + schmelzer-syncproxy4-eu: + address: 217.196.149.237 + hostgroups: secondary-IPs, rsyncd-hosts, https-service + parents: schmelzer # }}} # {{{ gw-csail csail-node01: @@ -716,11 +721,11 @@ servers: czerny: address: 82.195.75.109 parents: gw-manda - hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses + hostgroups: computers, service, dl380, acpid-hosts, stretch, manyprocesses clementi: address: 82.195.75.103 parents: gw-manda - hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses + hostgroups: computers, service, dl380, acpid-hosts, stretch, manyprocesses manda-node03: address: 82.195.75.69 parents: gw-manda @@ -741,10 +746,6 @@ servers: address: 82.195.75.98 parents: ganeti3 hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, heavy-exim - lully: - address: 82.195.75.99 - parents: ganeti3 - hostgroups: computers, service, hasbootfs, kvmdomains, stretch, hasvarlogfs draghi: address: 82.195.75.106 parents: ganeti3 @@ -830,13 +831,18 @@ servers: address: 140.211.166.194 parents: gw-osuosl hostgroups: computers, stretch, service, manyprocesses + loghost-osuosl-01: + address: 140.211.166.202 + parents: pijper + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd + pieta: address: 140.211.166.195 parents: gw-osuosl hostgroups: computers, stretch, service, manyprocesses ppc64el-osuosl-01: address: 140.211.166.196 - parents: pieta + parents: pijper hostgroups: computers, hassrvfs, buildd, stretch # }}} # {{{ gw-sanger @@ -991,14 +997,14 @@ servers: address: 209.87.16.46 parents: ubc-gateway hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost - kantuser: - address: 209.87.16.47 - parents: ubc-gateway - hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts grabbe: address: 209.87.16.48 parents: ubc-gateway hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https + trabaci: + address: 209.87.16.49 + parents: ubc-gateway + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd # }}} # {{{ gw-umn #saens: @@ -1053,6 +1059,10 @@ servers: address: 130.89.148.14 parents: klecker hostgroups: secondary-IPs + smit: + address: 130.89.148.78 + parents: gw-utwente + hostgroups: computers, service, stretch, r540, manyprocesses, incomingmailrelayed2025 # }}} # {{{ gw-ynic henze: @@ -1733,14 +1743,14 @@ services: runfrom: lotti hostgroups: computers - - name: remote logging on lully + name: remote logging on loghost-grnet-01 remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$" - runfrom: lully + runfrom: loghost-grnet-01 hostgroups: computers - - name: remote logging on loghost-grnet-01 + name: remote logging on loghost-osuosl-01 remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$" - runfrom: loghost-grnet-01 + runfrom: loghost-osuosl-01 hostgroups: computers # }}} # {{{ base service @@ -2045,7 +2055,7 @@ services: excludehosts: wieck, schumann - name: HW - OpenManage status - nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0" + nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0 -b bat_charge=0:0" hosts: wieck, schumann # }}} # }}} @@ -2691,6 +2701,16 @@ services: check: "dsa_check_staticsync!miniconf10.debconf.org" hosts: global servicegroups: mirror + - + name: mirror static sync - wiki + check: "dsa_check_staticsync!wiki.debconf.org" + hosts: global + servicegroups: mirror + - + name: mirror static sync - www + check: "dsa_check_staticsync!www.debconf.org" + hosts: global + servicegroups: mirror # }}} # {{{ DNS - @@ -2887,6 +2907,14 @@ 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" @@ -2900,6 +2928,13 @@ services: hostgroups: computers check_interval: 60 retry_interval: 15 + - + name: puppet - client cert + nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/$HOSTNAME$.debian.org.pem" + hostgroups: computers + check_interval: 60 + max_check_attempts: 2 + retry_interval: 5 #### - name: ping peer on mgmt network