X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=bd0243883ecf986b63c8f7f8ba972997850ea5c2;hb=8527cb0cd77a044a7e7a025213b18e5a710766d3;hp=9ca32f852609144d520c7a59192b82ea1c12994f;hpb=2439481805151ab7cd33e668ae2b4efc931bb94a;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 9ca32f8..bd02438 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -402,10 +402,6 @@ servers: address: 5.153.231.20 parents: ganeti-bytemark hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd - moszumanska: - address: 5.153.231.21 - parents: ganeti-bytemark - hostgroups: secondary-IPs dillon: address: 5.153.231.22 parents: ganeti-bytemark @@ -557,6 +553,11 @@ servers: address: 217.196.149.236 parents: ganeti-conova hostgroups: computers, hassrvfs, porterbox, stretch + + schmelzer: + address: 185.69.161.161 + parents: gw-conova + hostgroups: computers, service, stretch, r540, manyprocesses, apache2-hosts, rsyncd-hosts, apache-https, systemd-timesyncd # }}} # {{{ gw-csail csail-node01: @@ -725,6 +726,14 @@ servers: address: 82.195.75.103 parents: gw-manda hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses + manda-node03: + address: 82.195.75.69 + parents: gw-manda + hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses + manda-node04: + address: 82.195.75.70 + parents: gw-manda + hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses bendel: address: 82.195.75.100 parents: ganeti3 @@ -744,7 +753,7 @@ servers: draghi: address: 82.195.75.106 parents: ganeti3 - hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, stretch + hostgroups: computers, service, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, stretch geo1: address: 82.195.75.105 parents: ganeti3 @@ -822,13 +831,22 @@ servers: parents: byrd hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, apache-https + pijper: + address: 140.211.166.194 + parents: gw-osuosl + hostgroups: computers, stretch, service, manyprocesses + loghost-osuosl-01: + address: 140.211.166.202 + parents: pijper + hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd + pieta: address: 140.211.166.195 parents: gw-osuosl hostgroups: computers, stretch, service, manyprocesses ppc64el-osuosl-01: address: 140.211.166.196 - parents: pieta + parents: pijper hostgroups: computers, hassrvfs, buildd, stretch # }}} # {{{ gw-sanger @@ -843,7 +861,7 @@ servers: sibelius: address: 193.62.202.28 parents: gw-sanger - hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server, varnish-hosts + hostgroups: computers, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server, varnish-hosts contacts: tjrc1, dave # }}} # {{{ gw-scanplus @@ -983,10 +1001,6 @@ servers: address: 209.87.16.46 parents: ubc-gateway hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost - kantuser: - address: 209.87.16.47 - parents: ubc-gateway - hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts grabbe: address: 209.87.16.48 parents: ubc-gateway @@ -1045,6 +1059,10 @@ servers: address: 130.89.148.14 parents: klecker hostgroups: secondary-IPs + smit: + address: 130.89.148.78 + parents: gw-utwente + hostgroups: computers, service, stretch, r540, manyprocesses, incomingmailrelayed2025 # }}} # {{{ gw-ynic henze: @@ -1132,6 +1150,9 @@ hostgroups: pe1950: alias: Dell PowerEdge 1950 hosts private: 1 + r540: + alias: Dell PowerEdge R540 hosts + private: 1 jessie: alias: Hosts running jessie @@ -1176,9 +1197,6 @@ hostgroups: xinetd-hosts: alias: hosts providing services via xinetd private: 1 - postgres94-hosts: - alias: hosts running postgres94 - private: 1 postgres96-hosts: alias: hosts running postgres96 private: 1 @@ -1734,6 +1752,11 @@ services: remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$" runfrom: loghost-grnet-01 hostgroups: computers + - + name: remote logging on loghost-osuosl-01 + remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$" + runfrom: loghost-osuosl-01 + hostgroups: computers # }}} # {{{ base service - @@ -2033,7 +2056,12 @@ services: - name: HW - OpenManage status nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage" - hostgroups: pe1950 + hostgroups: pe1950, r540 + excludehosts: wieck, schumann + - + name: HW - OpenManage status + nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0 -b bat_charge=0:0" + hosts: wieck, schumann # }}} # }}} # {{{ ### mail stuff @@ -2065,12 +2093,12 @@ services: - name: process - fail2ban nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -C fail2ban-server" - hostgroups: heavy-exim + hostgroups: heavy-exim, heavy-postfix - name: unwanted process - fail2ban nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C fail2ban-server" hostgroups: computers - excludehostgroups: heavy-exim + excludehostgroups: heavy-exim, heavy-postfix # }}} # {{{ clamav - @@ -2391,15 +2419,11 @@ services: name: unwanted process - postgresql nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres" hostgroups: computers - excludehostgroups: postgres94-hosts, postgres96-hosts + excludehostgroups: postgres96-hosts - name: unwanted process - postgresql 9.0 nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'" hostgroups: computers - - - name: process - postgresql94 - master - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.4/bin/postgres'" - hostgroups: postgres94-hosts - name: process - postgresql96 - master nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.6/bin/postgres'" @@ -2682,6 +2706,16 @@ services: check: "dsa_check_staticsync!miniconf10.debconf.org" hosts: global servicegroups: mirror + - + name: mirror static sync - wiki + check: "dsa_check_staticsync!wiki.debconf.org" + hosts: global + servicegroups: mirror + - + name: mirror static sync - www + check: "dsa_check_staticsync!www.debconf.org" + hosts: global + servicegroups: mirror # }}} # {{{ DNS - @@ -2906,6 +2940,22 @@ services: check_interval: 5 max_check_attempts: 4 retry_interval: 1 + + - + name: ping peer on mgmt network + nrpe: "/usr/lib/nagios/plugins/check_ping -H 172.29.182.14 -w 50,10% -c 200,30%" + hosts: manda-node03 + check_interval: 5 + max_check_attempts: 4 + retry_interval: 1 + - + name: ping peer on mgmt network + nrpe: "/usr/lib/nagios/plugins/check_ping -H 172.29.182.13 -w 50,10% -c 200,30%" + hosts: manda-node04 + check_interval: 5 + max_check_attempts: 4 + retry_interval: 1 + # }}} # }}} # }}}