X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ccf316da2fbafbb0e7831298f146216748d79202;hb=4963a8af1986d6bd62bbd8e8f12112ef36c06d80;hp=cb9c73cf2a83287433f635aa13bc26e8ecaba9cd;hpb=9f238fc9fc1f7fb86abda3f00a7bd7fe9decb158;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index cb9c73c..ccf316d 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -46,7 +46,7 @@ servers: parents: gw-ubcece hostgroups: layer3-infrastructure gw-cecsit: - address: 150.203.164.38 + address: 150.203.164.1 parents: gw-ubcece hostgroups: layer3-infrastructure gw-arm: @@ -105,6 +105,10 @@ servers: address: 82.195.75.126 parents: gw-ubcece hostgroups: layer3-infrastructure + gw-man-da2: + address: 82.195.78.116 + parents: gw-ubcece + hostgroups: layer3-infrastructure gw-marist: address: 148.100.88.1 parents: gw-ubcece @@ -142,10 +146,6 @@ servers: address: 206.12.19.254 hostgroups: layer3-infrastructure contacts: lfilipoz - gw-ugent: - address: 193.191.17.50 - parents: gw-ubcece - hostgroups: layer3-infrastructure gw-umn: address: 128.101.240.222 parents: gw-ubcece @@ -230,6 +230,10 @@ servers: address: 141.170.6.155 parents: gw-aql hostgroups: computers, buildd, jessie, nfs-client + mips-aql-06: + address: 141.170.6.157 + parents: gw-aql + hostgroups: computers, buildd, jessie, hassrvfs minkus: address: 141.170.6.151 parents: gw-aql @@ -242,6 +246,10 @@ servers: address: 141.170.6.153 parents: gw-aql hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid + mipsel-aql-03: + address: 141.170.6.158 + parents: gw-aql + hostgroups: computers, buildd, jessie, hassrvfs # }}} # {{{ gw-arm abel: @@ -323,7 +331,7 @@ servers: bm-bl9: address: 5.153.231.249 parents: gw-bytemark - hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute, broken_mq + hostgroups: computers, bm-bl, service, jessie bm-bl10: address: 5.153.231.250 parents: gw-bytemark @@ -348,7 +356,7 @@ servers: milanollo: address: 5.153.231.2 parents: gw-bytemark - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-server, xinetd-hosts + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts milanollo2: address: 5.153.231.9 parents: milanollo @@ -398,7 +406,7 @@ servers: philp: address: 5.153.231.13 parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts + hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https rainier: address: 5.153.231.16 parents: ganeti-bytemark @@ -410,7 +418,7 @@ servers: delfin: address: 5.153.231.17 parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, nfs-client, autofs + hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs wuiet: address: 5.153.231.18 parents: ganeti-bytemark @@ -440,7 +448,7 @@ servers: petrova: address: 5.153.231.25 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, jessie, apache2-hosts + hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https oyens: address: 5.153.231.26 parents: ganeti-bytemark @@ -453,10 +461,6 @@ servers: address: 5.153.231.28 parents: ganeti-bytemark hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https - portman: - address: 5.153.231.29 - parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts paradis: address: 5.153.231.30 parents: ganeti-bytemark @@ -476,7 +480,7 @@ servers: httpredir-bm-01: address: 5.153.231.35 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs lindsay: address: 5.153.231.36 parents: ganeti-bytemark @@ -496,10 +500,6 @@ servers: address: 5.153.231.40 parents: ganeti-bytemark hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs - pittar: - address: 5.153.231.41 - parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs #, apache2-hosts pinel: address: 5.153.231.42 parents: ganeti-bytemark @@ -508,6 +508,10 @@ servers: address: 5.153.231.43 parents: ganeti-bytemark hostgroups: computers, service, kvmdomains, jessie, hassrvfs + manziarly: + address: 5.153.231.44 + parents: ganeti-bytemark + hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https # }}} # {{{ gw-c3sl santoro: @@ -659,6 +663,14 @@ servers: address: 194.177.211.205 parents: ganeti-grnet hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https + boott: + address: 194.177.211.206 + parents: ganeti-grnet + hostgroups: computers, service, hassrvfs, kvmdomains, jessie + porta: + address: 194.177.211.207 + parents: ganeti-grnet + hostgroups: computers, service, hassrvfs, kvmdomains, jessie # }}} # {{{ gw-isc schein: @@ -668,13 +680,13 @@ servers: mirror-isc: address: 149.20.20.7 parents: gw-isc - hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror + hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror mirror-isc2: address: 149.20.20.19 parents: mirror-isc hostgroups: secondary-IPs mirror-isc3: - address: 149.20.20.19 + address: 149.20.20.22 parents: mirror-isc hostgroups: secondary-IPs mirror-isc-syncproxy: @@ -779,7 +791,7 @@ servers: kaufmann: address: 82.195.75.107 parents: ganeti3 - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, jessie + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, jessie, apache-https stockhausen: address: 82.195.75.108 parents: ganeti3 @@ -807,7 +819,7 @@ servers: wolkenstein: address: 82.195.75.65 parents: ganeti3 - hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, jessie + hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https mipsel-manda-01: address: 82.195.75.72 parents: gw-man-da @@ -1018,11 +1030,11 @@ servers: glinka: address: 206.12.19.126 parents: ganeti2 - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, xinetd-hosts + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, xinetd-hosts tye: address: 206.12.19.129 parents: ganeti2 - hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs + hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs elgar: address: 206.12.19.130 parents: ganeti2 @@ -1060,8 +1072,6 @@ servers: parents: ganeti2 hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server # }}} - # {{{ gw-ugent - # }}} # {{{ gw-umn #saens: # address: 128.101.240.212 @@ -1070,7 +1080,7 @@ servers: mirror-umn: address: 128.101.240.212 parents: gw-umn - hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror + hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror mirror-umn2: address: 128.101.240.215 parents: mirror-umn @@ -1106,7 +1116,7 @@ servers: klecker: address: 130.89.148.10 parents: gw-utwente - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs + hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs klecker-ftp: address: 130.89.148.12 parents: klecker @@ -1372,9 +1382,9 @@ hostgroups: alioth: alias: machines that just are just awkward private: 1 - openstack-compute: - alias: nodes that run OpenStack compute - private: 1 + #openstack-compute: + # alias: nodes that run OpenStack compute + # private: 1 openstack-controller: alias: nodes that run OpenStack controller private: 1 @@ -1680,6 +1690,11 @@ services: excludehostgroups: buildd, porterbox, no-bacula check_interval: 60 retry_check_interval: 15 + - + 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 -c /etc/bacula/bacula-dir.conf'" + hosts: dinis - name: process - bacula-fd servicegroups: backup @@ -1970,6 +1985,11 @@ services: hostgroups: computers excludehostgroups: freebsd, alioth excludehosts: czerny, grnet-node01, storace, ubc-bl2 + ### + - + name: process - rngd + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd -a '/usr/sbin/rngd -r /dev/hwrng'" + hostgroups: kvmdomains # }}} # {{{ anti-services - @@ -2022,10 +2042,15 @@ services: 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 - - name: letsencrypt SSL certs + name: SSL certs - puppet hosts: global - remotecheck: "/srv/letsencrypt.debian.org/bin/check-cert-expire" - runfrom: denis + remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /etc/puppet/modules/ssl/files/servicecerts" + runfrom: handel + - + name: SSL certs - LE + hosts: global + remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /etc/puppet/modules/ssl/files/from-letsencrypt" + runfrom: handel # }}} # {{{ HW health/raid - @@ -2721,10 +2746,10 @@ services: # name: process - openstack - nova-api # nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-api -a '/usr/bin/python /usr/bin/nova-api --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-api.log'" # hostgroups: openstack-controller - - - name: process - openstack - nova-compute - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-compute -a '/usr/bin/python /usr/bin/nova-compute --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-compute.log --config-file=/etc/nova/nova-compute.conf'" - hostgroups: openstack-compute +# - +# name: process - openstack - nova-compute +# nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-compute -a '/usr/bin/python /usr/bin/nova-compute --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-compute.log --config-file=/etc/nova/nova-compute.conf'" +# hostgroups: openstack-compute # - # name: process - openstack - nova-cert # nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-cert -a '/usr/bin/python /usr/bin/nova-cert --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-cert.log'"