X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ec3d668dcfb3a1002caf40550ba2deea9d53bd79;hb=5a2b1e11c9c314cecb563f2121ff9991d24a1b4a;hp=a001252421f4b3724ed2ec2f6fd74c51a18f17e0;hpb=12f4f49f7b8f84db853de08df620f62c5314bde6;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index a001252..ec3d668 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -161,7 +161,7 @@ servers: schumann: address: 212.227.126.54 parents: gw-1und1-sec - hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hassrvfs, pe1950, physical_x86_intel + hostgroups: computers, service, apache2-hosts, rsyncd-hosts, buster, security_mirror, hassrvfs, pe1950, physical_x86_intel wieck: address: 195.20.242.89 parents: gw-1und1-sec @@ -361,10 +361,6 @@ servers: address: 5.153.231.12 parents: ganeti-bytemark hostgroups: computers, hassrvfs, kvmdomains, buster, systemd-timesyncd - philp: - address: 5.153.231.13 - parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd, broken_https_default_vhost rainier: address: 5.153.231.16 parents: ganeti-bytemark @@ -377,14 +373,6 @@ servers: address: 5.153.231.17 parents: ganeti-bytemark hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd - wuiet: - address: 5.153.231.18 - parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd - dinis: - address: 5.153.231.19 - parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, buster, hassrvfs, systemd-timesyncd donizetti: address: 5.153.231.20 parents: ganeti-bytemark @@ -421,10 +409,6 @@ servers: address: 5.153.231.34 parents: ganeti-bytemark hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd - lindsay: - address: 5.153.231.36 - parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd sor: address: 5.153.231.38 parents: ganeti-bytemark @@ -437,14 +421,6 @@ servers: address: 5.153.231.40 parents: ganeti-bytemark hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd - pinel: - address: 5.153.231.42 - parents: ganeti-bytemark - 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, stretch, hassrvfs, systemd-timesyncd casulana: address: 5.153.231.41 @@ -736,7 +712,7 @@ servers: handel: address: 82.195.75.104 parents: ganeti-manda - hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts, hassrvfs, systemd-timesyncd + hostgroups: computers, service, kvmdomains, apache2-hosts, buster, postgres11-hosts, hassrvfs, systemd-timesyncd kaufmann: address: 82.195.75.107 parents: ganeti-manda @@ -797,12 +773,20 @@ servers: address: 82.195.75.75 parents: ganeti-manda hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd + postgresql-manda-01: + address: 82.195.75.76 + parents: ganeti-manda + hostgroups: computers, service, kvmdomains, hassrvfs, buster, systemd-timesyncd + dinis: + address: 82.195.75.77 + parents: ganeti-manda + hostgroups: computers, general, kvmdomains, buster, hassrvfs, systemd-timesyncd # }}} # {{{ gw-marist zani: address: 148.100.88.22 parents: gw-marist - hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed + hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed587 # }}} # {{{ gw-osuosl byrd: @@ -980,7 +964,7 @@ servers: tye: address: 209.87.16.37 parents: ganeti2-ubc - hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd + hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd ullmann: address: 209.87.16.38 parents: ganeti2-ubc @@ -1010,6 +994,10 @@ servers: address: 209.87.16.46 parents: ganeti2-ubc hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost + static-master-ubc-01: + address: 209.87.16.47 + parents: ganeti2-ubc + hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd, hassrvfs grabbe: address: 209.87.16.48 parents: ganeti2-ubc @@ -1018,6 +1006,22 @@ servers: address: 209.87.16.49 parents: ganeti2-ubc hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd + wuiet: + address: 209.87.16.60 + parents: ganeti2-ubc + hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd + philp: + address: 209.87.16.61 + parents: ganeti2-ubc + hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd, broken_https_default_vhost + lindsay: + address: 209.87.16.62 + parents: ganeti2-ubc + hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd + pinel: + address: 209.87.16.63 + parents: ganeti2-ubc + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd ganeti3-ubc: address: 209.87.16.50 @@ -1105,20 +1109,16 @@ servers: hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs, physical_x86_intel klecker-ftp: address: 130.89.148.12 - parents: klecker + parents: new-klecker hostgroups: secondary-IPs klecker-archive: address: 130.89.148.13 parents: klecker hostgroups: secondary-IPs - klecker-static: - address: 130.89.148.14 - parents: klecker - hostgroups: secondary-IPs new-klecker: address: 130.89.148.77 parents: gw-utwente - hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, hassrvfs + hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, hassrvfs, apache2-hosts, apache-https smit: address: 130.89.148.78 parents: gw-utwente @@ -1344,7 +1344,7 @@ hostgroups: alias: hosts with a /var/log filesystem private: 1 - incomingmailrelayed: + incomingmailrelayed587: alias: incoming mail needs to go through a mail relay # i.e. no port 25 private: 1 @@ -1857,7 +1857,7 @@ services: hostgroups: computers - name: network service - munin-node - check: check_tcp!4949 + nrpe: "/usr/lib/nagios/plugins/check_tcp -H localhost -p 4949" hostgroups: computers depends: process - munin-node ### @@ -2344,7 +2344,7 @@ services: name: network service - smtp check: dsa_check_smtp hostgroups: computers - excludehostgroups: postfix-hosts, incomingmailrelayed, incomingmailrelayed2025 + excludehostgroups: postfix-hosts, incomingmailrelayed587, incomingmailrelayed2025 depends: process - exim - @@ -2355,7 +2355,7 @@ services: - name: network service - submission check: dsa_check_smtp_port!587 - hostgroups: incomingmailrelayed + hostgroups: incomingmailrelayed587 depends: process - exim - name: network service - smtp 2025