X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=dbe71ebd254252ad4ac7fecff18ac19f6feaa0b7;hb=f262b2a3c31c6a8d2d9f917f3e08c35a7966bd00;hp=6ae71b824f661c1347ba65ac9587bfde5a0047a2;hpb=aeb6cbda8a77f88c91e4f35af91c84ab70012037;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 6ae71b8..dbe71eb 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -189,7 +189,7 @@ servers: 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-systemd-hosts # }}} # {{{ gw-aql eller: @@ -368,7 +368,7 @@ servers: bmdb1: address: 5.153.231.10 parents: gw-bytemark - hostgroups: computers, hassrvfs, kvmdomains, stretch, postgres94-hosts, postgres96-hosts, systemd-timesyncd + hostgroups: computers, hassrvfs, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd ganeti-bytemark: address: 82.195.75.111 parents: gw-bytemark @@ -396,7 +396,7 @@ servers: delfin: address: 5.153.231.17 parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd + hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd wuiet: address: 5.153.231.18 parents: ganeti-bytemark @@ -466,7 +466,7 @@ servers: mirror-bytemark: address: 5.153.231.37 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, apache2-hosts, hassrvfs + hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, hassrvfs mirror-bytemark-debian: address: 5.153.231.45 hostgroups: secondary-IPs @@ -478,7 +478,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, autofs, nfs-client, systemd-timesyncd jerea: address: 5.153.231.39 parents: ganeti-bytemark @@ -486,7 +486,7 @@ 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 @@ -498,7 +498,7 @@ servers: 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 @@ -614,7 +614,7 @@ servers: soriano: address: 128.31.0.67 parents: ganeti-csail - hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https, systemd-timesyncd + hostgroups: computers, service, kvmdomains, hassrvfs, stretch, apache2-hosts, apache-https, systemd-timesyncd pkgmirror-csail: address: 128.31.0.51 parents: ganeti-csail @@ -680,7 +680,7 @@ servers: melartin: address: 194.177.211.208 parents: ganeti-grnet - hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, postgres96-hosts + hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, postgres96-hosts, hassrvfs static-master-grnet-01: address: 194.177.211.209 parents: ganeti-grnet @@ -767,7 +767,7 @@ servers: master: address: 82.195.75.110 parents: ganeti3 - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, spamd, heavy-exim, highload + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload fils: address: 82.195.75.89 parents: ganeti3 @@ -825,7 +825,7 @@ servers: wolkenstein: address: 82.195.75.65 parents: ganeti3 - hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https + hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, stretch, apache-https mips-manda-01: address: 82.195.75.66 parents: gw-manda @@ -1020,7 +1020,7 @@ servers: rachmaninoff: address: 209.87.16.20 parents: ubc-gateway - hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd x86-ubc-01: address: 209.87.16.21 parents: ubc-gateway @@ -1042,7 +1042,7 @@ servers: gombert: address: 209.87.16.25 parents: ubc-gateway - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd nono: address: 209.87.16.26 parents: ubc-gateway @@ -1058,11 +1058,11 @@ servers: menotti: address: 209.87.16.29 parents: ubc-gateway - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd danzi: address: 209.87.16.30 parents: ubc-gateway - hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd geo2: address: 209.87.16.31 parents: ubc-gateway @@ -1078,7 +1078,7 @@ servers: sonntag: address: 209.87.16.34 parents: ubc-gateway - hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd tchaikovsky: address: 209.87.16.35 parents: ubc-gateway @@ -1112,6 +1112,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 + debussy: + address: 209.87.16.46 + parents: ubc-gateway + hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd # }}} # {{{ gw-umn #saens: @@ -1157,7 +1161,7 @@ servers: klecker: address: 130.89.148.10 parents: gw-utwente - hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-systemd-hosts, dl380, jessie, incomingmailrelayed2025, hassrvfs + hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-systemd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs klecker-ftp: address: 130.89.148.12 parents: klecker @@ -1310,9 +1314,6 @@ hostgroups: amavis-hosts: 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 private: 1 @@ -2108,7 +2109,7 @@ services: - name: SSL certs - LE hosts: global - remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /etc/puppet/modules/ssl/files/from-letsencrypt" + remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /srv/puppet.debian.org/from-letsencrypt" runfrom: handel # }}} # {{{ HW health/raid @@ -3055,11 +3056,6 @@ services: 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