From: Julien Cristau Date: Fri, 20 Oct 2017 11:59:12 +0000 (+0200) Subject: rename rsyncd-systemd-hosts to rsyncd-hosts X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=91b505b7e184480334773a00556242c76145ad4e;p=mirror%2Fdsa-nagios.git rename rsyncd-systemd-hosts to rsyncd-hosts The only thing this does is check for open tcp/873, and we no longer need to make the xinetd vs systemd distinction. --- diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index dbe71eb..8207268 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -178,7 +178,7 @@ 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: @@ -189,7 +189,7 @@ servers: mirror-accumu: address: 130.242.6.199 parents: gw-accumu2 - hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-systemd-hosts + hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts # }}} # {{{ gw-aql eller: @@ -271,7 +271,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: @@ -509,7 +509,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 @@ -602,7 +602,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 @@ -634,7 +634,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 +676,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 @@ -708,19 +708,19 @@ servers: 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 @@ -801,7 +801,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 +809,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, jessie, 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-systemd-hosts, uploadqueue, kvmdomains, apache-https, postgres94-hosts, jessie + hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, apache-https, postgres94-hosts, jessie suchon: address: 82.195.75.68 parents: ganeti3 @@ -870,7 +870,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 +901,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 +913,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: @@ -1121,7 +1121,7 @@ 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 @@ -1161,7 +1161,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 +1203,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 ############################# @@ -1314,8 +1314,8 @@ hostgroups: amavis-hosts: alias: hosts running amavis private: 1 - rsyncd-systemd-hosts: - alias: hosts providing rsync services via systemd + rsyncd-hosts: + alias: hosts providing rsync services private: 1 xinetd-hosts: alias: hosts providing services via xinetd @@ -3055,7 +3055,7 @@ services: - name: network service - rsync check: check_tcp!873 - hostgroups: rsyncd-systemd-hosts + hostgroups: rsyncd-hosts - name: network service - rsync check: check_tcp!873