X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=c3638fd84974248abbf569972869970a9d8e6748;hb=ecb01d5552a674810f43ab0f51cf66a9771a3f5f;hp=b1e6fea50f361fa7109867cf4f416982c1a36f05;hpb=086dfc4c7f948116f3a186bdefa2efcb35b70e6b;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index b1e6fea..c3638fd 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -160,6 +160,10 @@ servers: address: 147.215.2.249 parents: gw-HP-ftc hostgroups: routing-infrastructure + gw-ghent: + address: 193.191.17.50 + parents: gw-HP-ftc + hostgroups: routing-infrastructure global: hostgroups: notacomputer @@ -220,7 +224,7 @@ servers: morales: address: 82.195.75.97 parents: gw-man-da - hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs + hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, puppet contacts: bzed sperger: address: 82.195.75.98 @@ -313,6 +317,14 @@ servers: address: 128.31.0.46 parents: gw-mit-csail hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, puppet + rore: + address: 128.31.0.49 + parents: gw-mit-csail + hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl360, acpid-hosts + carver: + address: 128.31.0.50 + parents: gw-mit-csail + hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl380, acpid-hosts, hassrvfs, ulogd-hosts klecker: address: 194.109.137.218 @@ -412,16 +424,6 @@ servers: parents: gw-xandros hostgroups: deadslow - kullervo: - address: 217.114.76.82 - parents: gw-nmmn - hostgroups: deadslow - contacts: luk - crest: - address: 217.114.76.83 - parents: gw-nmmn - hostgroups: deadslow - contacts: luk pescetti: address: 217.114.76.85 parents: gw-nmmn @@ -446,9 +448,14 @@ servers: allegri: address: 157.193.39.233 - parents: gw-HP-ftc + parents: gw-ghent hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet, hassrvfs contacts: luk + ancina: + address: 157.193.39.13 + parents: gw-ghent + hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs, incomingmailrelayed2025 + contacts: luk agnesi: address: 65.173.90.83 @@ -524,7 +531,7 @@ servers: schein: address: 149.20.20.6 parents: gw-isc - hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360 + hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360, bind9-hosts praetorius: address: 130.239.18.121 @@ -534,7 +541,7 @@ servers: lafayette: address: 147.215.7.160 parents: gw-esiee - hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet + hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs, incomingmailrelayed ############################# # host groups @@ -691,6 +698,14 @@ hostgroups: alias: hosts with a /srv private: 1 + incomingmailrelayed: + alias: incoming mail needs to go through a mail relay + # i.e. no port 25 + private: 1 + incomingmailrelayed2025: + alias: incoming mail needs to go through a mail relay + # i.e. no port 25 + private: 1 ############################# # servicegroups @@ -963,15 +978,8 @@ services: check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3" depends: network service - sshd hostgroups: computers, deadslow - excludehosts: crest, kullervo excludehostgroups: lenny normal_check_interval: 60 - - - name: "network service - sshd - version" - check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2+m68k1" - depends: network service - sshd - hosts: crest, kullervo - normal_check_interval: 60 - name: "network service - sshd - version" check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5" @@ -1028,12 +1036,12 @@ services: check: dsa_check_ntp hostgroups: computers depends: process - ntpd - excludehosts: allegri, zelenka + excludehosts: allegri, zelenka, ancina # - name: network service - time check: dsa_check_time - hosts: allegri, zelenka + hosts: allegri, zelenka, ancina depends: process - xinetd ### @@ -1301,7 +1309,7 @@ services: name: network service - smtp check: dsa_check_smtp hostgroups: computers - excludehostgroups: postfix-hosts + excludehostgroups: postfix-hosts, incomingmailrelayed, incomingmailrelayed2025 depends: process - exim - @@ -1310,6 +1318,16 @@ services: hostgroups: postfix-hosts excludehosts: verdi, kassia, allegri, piatti depends: process - postfix - master + - + name: network service - submission + check: dsa_check_smtp_port!587 + hostgroups: incomingmailrelayed + depends: process - exim + - + name: network service - smtp 2025 + check: dsa_check_smtp_port!2025 + hostgroups: incomingmailrelayed2025 + depends: process - exim - name: network service - smtp - port 2025 check: dsa_check_smtp_port!2025 @@ -1406,6 +1424,12 @@ services: nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw" hostgroups: sw-raid + ### + - + name: process - monit + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'" + hostgroups: lenny + excludehosts: agnesi ### - name: process - cpqarrayd @@ -1488,13 +1512,13 @@ services: - name: process - xinetd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'" - hosts: samosa, allegri, gluck, zelenka + hosts: samosa, allegri, gluck, zelenka, ancina hostgroups: rsyncd-hosts - name: unwanted process - xinetd nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd" hostgroups: computers - excludehosts: samosa, allegri, gluck, zelenka + excludehosts: samosa, allegri, gluck, zelenka, ancina excludehostgroups: rsyncd-hosts ### -