X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=fc8ec246cbdb839c888b92d501a20279e7e8dc1a;hb=252c07da68ad83abf79c843a8908fde7990e9255;hp=3dc14f03dfe9f7c9d861d512ae73764bc97630ae;hpb=3fdc0d7cec9a695d1a2bd081671e48faf0f9213d;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 3dc14f0..fc8ec24 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -178,18 +178,17 @@ servers: wieck: address: 195.20.242.89 parents: gw-1und1-sec - hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula # }}} # {{{ gw-accumu pettersson: address: 130.239.18.123 parents: gw-accumu - hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, jessie, autofs, sw-raid - ## No need to update to Stretch, casulana replaces it. It should eventually die. + hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, stretch, autofs, sw-raid mirror-accumu: address: 130.242.6.199 parents: gw-accumu2 - hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts + hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts # }}} # {{{ gw-aql eller: @@ -271,7 +270,7 @@ servers: fasolo: address: 138.16.160.17 parents: gw-brown - hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-systemd-hosts, stretch, hassrvfs, postgres96-hosts, manyprocesses + hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-hosts, stretch, hassrvfs, postgres96-hosts, manyprocesses # }}} # {{{ gw-bytemark bm-bl1: @@ -338,11 +337,11 @@ servers: milanollo2: address: 5.153.231.9 parents: milanollo - hostgroups: secondary-IPs + hostgroups: secondary-IPs, rsyncd-hosts 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 @@ -370,7 +369,7 @@ servers: parents: gw-bytemark hostgroups: computers, hassrvfs, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd ganeti-bytemark: - address: 82.195.75.111 + address: 5.153.231.1 parents: gw-bytemark hostgroups: notacomputer coccia: @@ -418,11 +417,11 @@ 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 - hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd + hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd petrova: address: 5.153.231.25 parents: ganeti-bytemark @@ -438,7 +437,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 +453,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 +477,7 @@ servers: sor: address: 5.153.231.38 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, 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 @@ -486,19 +485,19 @@ servers: mekeel: address: 5.153.231.40 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd 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 - 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 casulana: address: 5.153.231.41 @@ -509,7 +508,7 @@ servers: santoro: address: 200.17.202.197 parents: gw-c3sl - hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, hassrvfs, stretch, high-RTT, security_mirror, no-bacula, apache-https + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, hassrvfs, stretch, high-RTT, security_mirror, no-bacula, apache-https contacts: faw # }}} # {{{ gw-cecsit @@ -520,11 +519,11 @@ servers: mirror-anu2: address: 150.203.164.60 parents: mirror-anu - hostgroups: secondary-IPs + hostgroups: secondary-IPs, rsyncd-hosts mirror-anu3: address: 150.203.164.61 parents: mirror-anu - hostgroups: secondary-IPs, security_mirror + hostgroups: secondary-IPs, security_mirror, rsyncd-hosts mirror-anu4: address: 150.203.164.62 parents: mirror-anu @@ -546,22 +545,22 @@ 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 parents: mirror-conova mirror-conova-security: address: 217.196.149.233 - hostgroups: secondary-IPs + hostgroups: secondary-IPs, rsyncd-hosts, security_mirror parents: mirror-conova mirror-conova-archive: address: 217.196.149.234 - hostgroups: secondary-IPs + hostgroups: secondary-IPs, rsyncd-hosts parents: mirror-conova mirror-conova-syncproxy4-eu: address: 217.196.149.237 - hostgroups: secondary-IPs + hostgroups: secondary-IPs, rsyncd-hosts, https-service parents: mirror-conova arm-conova-01: @@ -602,7 +601,7 @@ servers: mirror-csail: address: 128.31.0.62 parents: ganeti-csail - hostgroups: computers, service, hassrvfs, kvmdomains, stretch, apache2-hosts, rsyncd-systemd-hosts, apache-https, systemd-timesyncd + hostgroups: computers, service, hassrvfs, kvmdomains, stretch, apache2-hosts, rsyncd-hosts, apache-https, systemd-timesyncd x86-csail-01: address: 128.31.0.50 parents: ganeti-csail @@ -618,7 +617,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 @@ -634,7 +633,7 @@ servers: sechter: address: 128.61.240.73 parents: gw-gatech - hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror # }}} # {{{ gw-grnet ganeti-grnet: @@ -676,7 +675,7 @@ servers: porta: address: 194.177.211.207 parents: ganeti-grnet - hostgroups: computers, service, hassrvfs, kvmdomains, stretch, rsyncd-systemd-hosts, systemd-timesyncd + hostgroups: computers, service, hassrvfs, kvmdomains, stretch, rsyncd-hosts, systemd-timesyncd melartin: address: 194.177.211.208 parents: ganeti-grnet @@ -690,11 +689,11 @@ servers: mirror-isc: address: 149.20.4.13 parents: gw-isc - hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch, security_mirror + hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch mirror-isc2: address: 149.20.4.14 parents: mirror-isc - hostgroups: secondary-IPs + hostgroups: secondary-IPs, rsyncd-hosts, security_mirror mirror-isc3: address: 149.20.4.15 parents: mirror-isc @@ -702,25 +701,25 @@ servers: mirror-isc-syncproxy: address: 149.20.4.16 parents: mirror-isc - hostgroups: secondary-IPs + hostgroups: secondary-IPs, rsyncd-hosts # }}} # {{{ gw-leaseweb lw01: address: 185.17.185.177 parents: gw-leaseweb - hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts + hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts lw02: address: 185.17.185.178 parents: gw-leaseweb - hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts + hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts lw03: address: 185.17.185.179 parents: gw-leaseweb - hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts + hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts lw04: address: 185.17.185.180 parents: gw-leaseweb - hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts + hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts lw07: address: 185.17.185.187 parents: gw-leaseweb @@ -755,15 +754,15 @@ 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 - hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, jessie, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs + hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, stretch, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs master: address: 82.195.75.110 parents: ganeti3 @@ -801,7 +800,7 @@ servers: kaufmann: address: 82.195.75.107 parents: ganeti3 - hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, stretch, apache-https + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, stretch, apache-https ganeti3: address: 82.195.75.111 parents: gw-manda @@ -809,7 +808,7 @@ servers: wilder: address: 82.195.75.112 parents: ganeti3 - hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-systemd-hosts + hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-hosts mailly: address: 82.195.75.114 parents: ganeti3 @@ -845,7 +844,7 @@ servers: seger: address: 82.195.75.93 parents: ganeti3 - hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-systemd-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 @@ -870,7 +869,7 @@ servers: beach: address: 140.211.166.201 parents: byrd - hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https + hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, apache-https pieta: address: 140.211.166.195 @@ -901,7 +900,7 @@ servers: sibelius: address: 193.62.202.28 parents: gw-sanger - hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-systemd-hosts, hasvarlogfs, multipath-hosts, nfs-server + hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server contacts: tjrc1, dave smetana: address: 193.62.202.29 @@ -913,11 +912,11 @@ servers: lobos: address: 212.211.132.250 parents: gw-scanplus-lobos - hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hassrvfs, stretch, security_mirror + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, stretch, security_mirror villa: address: 212.211.132.32 parents: gw-scanplus-villa - hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl360, hassrvfs, stretch, security_mirror + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, stretch, security_mirror # }}} # {{{ gw-sil eberlin: @@ -1038,7 +1037,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 @@ -1121,19 +1120,19 @@ servers: #saens: # address: 128.101.240.212 # parents: gw-umn - # hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula + # hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula mirror-umn: address: 128.101.240.212 parents: gw-umn - hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch, security_mirror + hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch mirror-umn2: address: 128.101.240.215 parents: mirror-umn - hostgroups: secondary-IPs + hostgroups: secondary-IPs, rsyncd-hosts, security_mirror mirror-umn3: address: 128.101.240.216 parents: mirror-umn - hostgroups: secondary-IPs + hostgroups: secondary-IPs, rsyncd-hosts mirror-umn4: address: 128.101.240.217 parents: mirror-umn @@ -1161,7 +1160,7 @@ servers: klecker: address: 130.89.148.10 parents: gw-utwente - hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-systemd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs + hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs klecker-ftp: address: 130.89.148.12 parents: klecker @@ -1203,7 +1202,7 @@ servers: setoguchi: address: 133.242.99.74 parents: gw-sakura - hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-systemd-hosts, security_mirror + hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, security_mirror # }}} # {{{ ############################# host groups ############################# @@ -1315,10 +1314,7 @@ hostgroups: alias: hosts running amavis private: 1 rsyncd-hosts: - alias: hosts providing rsync services via xinetd - private: 1 - rsyncd-systemd-hosts: - alias: hosts providing rsync services via systemd + alias: hosts providing rsync services private: 1 xinetd-hosts: alias: hosts providing services via xinetd @@ -1350,6 +1346,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 @@ -2375,42 +2374,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 @@ -2522,6 +2501,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 @@ -2537,7 +2522,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 - @@ -2551,20 +2536,7 @@ services: - name: network service - ftp check: check_ftp - hostgroups: uploadqueue, security_mirror - excludehosts: klecker, mirror-isc, mirror-umn - - - name: network service - ftp - check: check_ftp - hosts: klecker-ftp - - - name: network service - ftp - check: check_ftp - hosts: mirror-umn2 - - - name: network service - ftp - check: check_ftp - hosts: mirror-isc2 + hostgroups: uploadqueue # }}} # {{{ postgres - @@ -3055,31 +3027,10 @@ services: hosts: draghi depends: process - xinetd ### - - - name: network service - rsync - check: check_tcp!873 - hostgroups: rsyncd-systemd-hosts - name: network service - rsync check: check_tcp!873 hostgroups: rsyncd-hosts - depends: process - xinetd - - - name: network service - rsync - check: check_tcp!873 - hosts: milanollo2 - - - name: network service - rsync - check: check_tcp!873 - hosts: mirror-isc2, mirror-isc-syncproxy - - - name: network service - rsync - check: check_tcp!873 - hosts: mirror-umn2, mirror-umn3 - - - name: network service - rsync - check: check_tcp!873 - hosts: mirror-anu2, mirror-anu3 ### - name: process - icinga