X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=99e8f9ef250123a0e1e1e86f622c48c5fcc43e51;hb=50d24797b2a095b2043643d6a9a4b230eba71d20;hp=2ae057db3e55350b97c3af5504e3de80420bc8b5;hpb=0d6871110ffc88fc5c71fb83892f1e71b0ecc295;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 2ae057d..99e8f9e 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -342,7 +342,7 @@ servers: picconi: address: 5.153.231.3 parents: gw-bytemark - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd senfter: address: 5.153.231.4 parents: gw-bytemark @@ -418,7 +418,7 @@ servers: dillon: address: 5.153.231.22 parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs, systemd-timesyncd + hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, hassrvfs, systemd-timesyncd ticharich: address: 5.153.231.23 parents: ganeti-bytemark @@ -438,7 +438,7 @@ servers: quantz: address: 5.153.231.28 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd respighi: address: 5.153.231.29 parents: ganeti-bytemark @@ -454,7 +454,7 @@ servers: tate: address: 5.153.231.33 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd gideon: address: 5.153.231.34 parents: ganeti-bytemark @@ -478,7 +478,7 @@ servers: sor: address: 5.153.231.38 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, autofs, nfs-client, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, autofs, nfs-client, systemd-timesyncd jerea: address: 5.153.231.39 parents: ganeti-bytemark @@ -490,11 +490,11 @@ servers: pinel: address: 5.153.231.42 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd rusca: address: 5.153.231.43 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd manziarly: address: 5.153.231.44 parents: ganeti-bytemark @@ -546,7 +546,7 @@ servers: mirror-conova: address: 217.196.149.229 parents: gw-conova - hostgroups: computers, stretch, service, apache2-hosts, apache-https + hostgroups: computers, stretch, service, apache2-hosts mirror-conova-debian: address: 217.196.149.232 hostgroups: secondary-IPs @@ -561,7 +561,7 @@ servers: parents: mirror-conova mirror-conova-syncproxy4-eu: address: 217.196.149.237 - hostgroups: secondary-IPs, rsyncd-hosts + hostgroups: secondary-IPs, rsyncd-hosts, https-service parents: mirror-conova arm-conova-01: @@ -618,7 +618,7 @@ servers: pkgmirror-csail: address: 128.31.0.51 parents: ganeti-csail - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd usper: address: 128.31.0.69 parents: ganeti-csail @@ -755,11 +755,11 @@ servers: czerny: address: 82.195.75.109 parents: gw-manda - hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts + hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts clementi: address: 82.195.75.103 parents: gw-manda - hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts + hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts bendel: address: 82.195.75.100 parents: ganeti3 @@ -809,7 +809,7 @@ servers: wilder: address: 82.195.75.112 parents: ganeti3 - hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-hosts + hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-hosts mailly: address: 82.195.75.114 parents: ganeti3 @@ -845,7 +845,7 @@ servers: seger: address: 82.195.75.93 parents: ganeti3 - hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, apache-https, postgres94-hosts, jessie + hostgroups: computers, service, apache2-hosts, hassrvfs, rsyncd-hosts, kvmdomains, apache-https, postgres96-hosts, stretch suchon: address: 82.195.75.68 parents: ganeti3 @@ -1038,7 +1038,7 @@ servers: elgar: address: 209.87.16.24 parents: ubc-gateway - hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd gombert: address: 209.87.16.25 parents: ubc-gateway @@ -1347,6 +1347,9 @@ hostgroups: apache-https: alias: hosts with https services private: 1 + https-service: + alias: https service for secondary addresses + private: 1 broken_https_default_vhost: alias: https default vhost does not say 200 OK private: 1 @@ -2372,42 +2375,22 @@ services: # }}} # {{{ postfix ### - - - name: process - postfix - master - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/master'" - hostgroups: postfix-hosts - excludehostgroups: stretch - name: process - postfix - master nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/sbin/master'" hostgroups: postfix-hosts - excludehostgroups: jessie - - - name: process - postfix - qmgr - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t fifo -u'" - hostgroups: postfix-hosts - depends: process - postfix - master - excludehostgroups: stretch - name: process - postfix - qmgr nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t unix -u'" hostgroups: postfix-hosts depends: process - postfix - master - excludehostgroups: jessie - - - name: process - postfix - pickup - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t fifo -u -c'" - hostgroups: postfix-hosts - depends: process - postfix - master - excludehostgroups: stretch - name: process - postfix - pickup nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t unix -u -c'" hostgroups: postfix-hosts depends: process - postfix - master - excludehostgroups: jessie - name: process - postfix - anvil @@ -2519,6 +2502,12 @@ services: excludehostgroups: broken_https_default_vhost depends: "process - apache2 - master" check_interval: 120 + - + name: network service - https + check: check_https + hostgroups: https-service + excludehostgroups: broken_https_default_vhost + check_interval: 120 - name: network service - https check: dsa_check_https_want_auth @@ -2534,7 +2523,7 @@ services: - name: network service - https cert check: dsa_check_cert!443 - hostgroups: apache-https + hostgroups: apache-https, https-service depends: network service - https check_interval: 60 - @@ -2548,11 +2537,7 @@ services: - name: network service - ftp check: check_ftp - hostgroups: uploadqueue, security_mirror - - - name: network service - ftp - check: check_ftp - hosts: klecker-ftp + hostgroups: uploadqueue # }}} # {{{ postgres -