X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b591ac389c9da7bd0cd6a403e035915df5bd2905;hb=83cd12cb6afe7f7d2d0de2789817e9407cc54831;hp=00701a556f272674c11d40731d6c8e13cdc338a5;hpb=8fd384b94d66fe136da9009fd3afd26751d1f41b;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 00701a5..b591ac3 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -373,22 +373,10 @@ servers: address: 5.153.231.17 parents: ganeti-bytemark hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, 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 - hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd dillon: address: 5.153.231.22 parents: ganeti-bytemark hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, hassrvfs, systemd-timesyncd - ticharich: - address: 5.153.231.23 - parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, buster, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd petrova: address: 5.153.231.25 parents: ganeti-bytemark @@ -413,10 +401,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 @@ -429,10 +413,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 casulana: address: 5.153.231.41 @@ -789,12 +769,16 @@ servers: 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: @@ -972,7 +956,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 @@ -1022,6 +1006,22 @@ servers: 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 + ticharich: + address: 209.87.16.64 + parents: ganeti2-ubc + hostgroups: computers, general, kvmdomains, buster, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd + donizetti: + address: 209.87.16.65 + parents: ganeti2-ubc + hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd ganeti3-ubc: address: 209.87.16.50 @@ -1109,16 +1109,12 @@ 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 @@ -1348,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 @@ -1861,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 ### @@ -2348,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 - @@ -2359,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 @@ -2801,8 +2797,18 @@ services: hostgroups: bind9-hosts - name: network service - dns - check: check_dns - hostgroups: bind9-hosts + check: check_dig!www.debian.org! + hosts: geo1, geo2, geo3 + depends: process - named + - + name: network service - dns + check: check_dig!_openpgpkey.debian.org!-A -t SOA + hosts: kaufmann + depends: process - named + - + name: network service - dns + check: check_dig!debian.org!-A -t SOA + hosts: denis depends: process - named - name: unwanted process - named