X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=52d5917b6b9f87496fb7840727eb55d984c1001d;hb=e4f3e2ccdbbe9db8f76d23d0713cf2934961f947;hp=9b92b1325b32b916b9e9cec66728bb3665ebe77e;hpb=4291aef329b21371e254e9b9242c56b2ec51b326;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 9b92b13..52d5917 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -85,7 +85,7 @@ servers: parents: gw-ubcece hostgroups: layer3-infrastructure gw-marist: - address: 148.100.96.1 + address: 148.100.88.1 parents: gw-ubcece hostgroups: layer3-infrastructure gw-osuosl: @@ -321,6 +321,10 @@ servers: address: 5.153.231.13 parents: gw-bytemark hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts + petrova: + address: 5.153.231.25 + parents: gw-bytemark + hostgroups: computers, kvmdomains, wheezy, apache2-hosts couper: address: 5.153.231.14 parents: gw-bytemark @@ -503,7 +507,7 @@ servers: vento: address: 82.195.75.98 parents: ganeti3 - hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, heavy-exim + hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https, heavy-exim lully: address: 82.195.75.99 parents: ganeti3 @@ -532,6 +536,10 @@ servers: address: 82.195.75.107 parents: ganeti3 hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, wheezy + stockhausen: + address: 82.195.75.108 + parents: ganeti3 + hostgroups: computers, service, kvmdomains, wheezy, acpid-hosts, jetty-hosts ganeti3: address: 82.195.75.111 parents: gw-man-da @@ -554,10 +562,10 @@ servers: hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts # }}} # {{{ gw-marist - zappa: - address: 148.100.96.103 + zani: + address: 148.100.88.22 parents: gw-marist - hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed + hostgroups: computers, buildd, hassrvfs, wheezy # }}} # {{{ gw-osuosl busoni: @@ -604,7 +612,7 @@ servers: caballero: address: 193.201.200.200 parents: gw-rapidswitch - hostgroups: computers, buildd, sw-raid, squeeze + hostgroups: computers, buildd, sw-raid, wheezy, hassrvfs, acpid-hosts # }}} # {{{ gw-sanger sibelius: @@ -850,7 +858,7 @@ servers: ullmann: address: 206.12.19.141 parents: ganeti2 - hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs + hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs, apache-https sonntag: address: 206.12.19.142 parents: ganeti2 @@ -1043,6 +1051,9 @@ hostgroups: apache2-hosts: alias: hosts running apache2 private: 1 + jetty-hosts: + alias: hosts running jetty + private: 1 varnish-hosts: alias: hosts running varnish private: 1 @@ -1171,8 +1182,6 @@ servicegroups: alias: backup checks kernel: alias: kernel checks - weaksshkeys: - alias: weak ssh keys apt: alias: apt upgrade status samhain: @@ -1181,7 +1190,7 @@ servicegroups: alias: time stuff security: alias: security - servicegroup_members: apt, weaksshkeys, kernel, samhain + servicegroup_members: apt, kernel, samhain ############################# # services @@ -1278,11 +1287,6 @@ services: servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home" hostgroups: hashomefs - - - name: disk usage on /x - servicegroups: diskspace - nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x" - hosts: caballero - name: disk usage on /var/lib/postgresql servicegroups: diskspace @@ -1548,13 +1552,6 @@ services: depends: process - sshd normal_check_interval: 60 notification_interval: 1440 - - - - name: ssh - weak keys - servicegroups: weaksshkeys - nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys" - hostgroups: computers - normal_check_interval: 60 #### - name: network service - nrpe @@ -1863,11 +1860,11 @@ services: check: dsa_check_smtp hostgroups: postfix-hosts depends: process - postfix - master - - - name: network service - submission - check: dsa_check_smtp_port!587 - hostgroups: incomingmailrelayed - depends: process - exim +# - +# 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 @@ -2001,13 +1998,12 @@ services: - 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 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'" - hostgroups: computers - excludehosts: quantz - excludehostgroups: armhf + hostgroups: squeeze - name: process - monit nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'" - hostgroups: wheezy + hostgroups: computers + excludehostgroups: squeeze - name: HW - hpacucli status servicegroups: raid @@ -2187,6 +2183,16 @@ services: # there is always one extra process per check currently running.. nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'" hosts: tchaikovsky + ### + - + name: process - jetty - master + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -a 'jsvc.exec'" + hostgroups: jetty-hosts + - + name: process - jetty - worker + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u jetty -a 'jsvc.exec -user jetty'" + hostgroups: jetty-hosts + depends: process - jetty - master ### - @@ -2477,23 +2483,23 @@ services: retry_check_interval: 5 - name: DNS SOA sync - debian.org - check: "dsa_check_soas_add!draghi.debian.org!debian.org" + check: "dsa_check_soas_add!denis.debian.org!debian.org" hosts: global - name: DNS SOA sync - debian.net - check: "dsa_check_soas_add!draghi.debian.org!debian.net" + check: "dsa_check_soas_add!denis.debian.org!debian.net" hosts: global - name: DNS SOA sync - debian.com - check: "dsa_check_soas_add!draghi.debian.org!debian.com" + check: "dsa_check_soas_add!denis.debian.org!debian.com" hosts: global - name: DNS SOA sync - mirror.debian.net - check: "dsa_check_soas_add!draghi.debian.org!mirror.debian.net" + check: "dsa_check_soas_add!denis.debian.org!mirror.debian.net" hosts: global - name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa - check: "dsa_check_soas_add!draghi.debian.org!144-28.118.59.86.in-addr.arpa" + check: "dsa_check_soas_add!denis.debian.org!144-28.118.59.86.in-addr.arpa" hosts: global - name: DNS SOA sync - alioth.debian.org