X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=config%2Fnagios-master.cfg;h=6b7c0955ef2f8f05244af6a9c5d9d3172e929a26;hb=7d4bb8d15c78dd22621dd58da42848fbbca4881d;hp=e9c4c8f4576b8f3fbb95a8509a7451de16d677ca;hpb=a4833a436bbcd83f52dd0a8262908d45281d7ba2;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index e9c4c8f..6b7c095 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -227,6 +227,14 @@ servers: address: 141.170.6.150 parents: gw-aql hostgroups: computers, buildd, wheezy + mipsel-aql-01: + address: 141.170.6.152 + parents: gw-aql + hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid + mipsel-aql-02: + address: 141.170.6.153 + parents: gw-aql + hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid # }}} # {{{ gw-arm abel: @@ -260,7 +268,7 @@ servers: ia64-arm-01: address: 217.140.96.61 parents: gw-arm - hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd, broken_mq, sw-raid + hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd, broken_mq, sw-raid, acpid-hosts # }}} # {{{ gw-brown franck: @@ -363,11 +371,7 @@ servers: coccia: address: 5.153.231.11 parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts - backuphost: - address: 5.153.231.12 - parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, wheezy + hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts philp: address: 5.153.231.13 parents: ganeti-bytemark @@ -450,6 +454,10 @@ servers: address: 5.153.231.35 parents: ganeti-bytemark hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts + lindsay: + address: 5.153.231.36 + parents: ganeti-bytemark + hostgroups: computers, service, kvmdomains, jessie # }}} # {{{ gw-c3sl santoro: @@ -660,10 +668,6 @@ servers: address: 82.195.75.99 parents: ganeti3 hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs - rem: - address: 82.195.75.68 - parents: gw-man-da - hostgroups: computers, hasbootfs, hassrvfs, wheezy, no-bacula draghi: address: 82.195.75.106 parents: ganeti3 @@ -704,6 +708,10 @@ servers: address: 82.195.75.92 parents: ganeti3 hostgroups: computers, service, kvmdomains, wheezy + wolkenstein: + address: 82.195.75.65 + parents: ganeti3 + hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy mipsel-manda-01: address: 82.195.75.72 parents: gw-man-da @@ -865,10 +873,6 @@ servers: address: 206.12.19.118 parents: ganeti2 hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy - wolkenstein: - address: 206.12.19.116 - parents: ganeti2 - hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy brahms: address: 206.12.19.115 parents: ganeti2 @@ -1013,9 +1017,13 @@ servers: address: 143.106.167.145 parents: gw-unicamp hostgroups: layer3-infrastructure + prokofiev: + address: 143.106.167.147 + parents: gw-unicamp + hostgroups: computers, jessie, acpid-hosts, service powerpc-unicamp-01: address: 143.106.167.149 - parents: asgard + parents: prokofiev hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy # }}} # {{{ gw-utwente @@ -1167,6 +1175,8 @@ hostgroups: alias: Hosts running squeeze wheezy: alias: Hosts running wheezy + jessie: + alias: Hosts running jessie kvmdomains: alias: Hosts that are KVM domains @@ -1543,6 +1553,12 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty" hostgroups: computers excludehosts: zelenka, zandonai + excludehostgroups: jessie + - + name: process - getty + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty" + hostgroups: computers + hostgroups: jessie - name: processes - zombies nrpe: "/usr/lib/nagios/plugins/check_procs 5 10 -s Z" @@ -1566,7 +1582,7 @@ services: servicegroups: backup nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup" hostgroups: computers - excludehosts: backuphost, storace + excludehosts: storace normal_check_interval: 60 max_check_attempts: 2 retry_check_interval: 5 @@ -1574,7 +1590,7 @@ services: name: backup server config servicegroups: backup nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server" - hosts: backuphost, storace + hosts: storace normal_check_interval: 60 max_check_attempts: 2 retry_check_interval: 5 @@ -1643,7 +1659,12 @@ services: name: process - ulogd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'" hostgroups: computers - excludehostgroups: freebsd, sparc + excludehostgroups: freebsd, sparc, jessie + - + name: process - ulogd + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ulog -C ulogd -a '/usr/sbin/ulogd --daemon --uid ulog'" + hostgroups: jessie + excludehostgroups: freebsd - name: unexpected process - ulogd nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd" @@ -1739,7 +1760,7 @@ services: - name: process - munin-node nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'" - hostgroups: wheezy + hostgroups: wheezy, jessie excludehostgroups: freebsd - name: network service - munin-node @@ -1857,7 +1878,7 @@ services: - name: process - stunnel4 - puppet-ekeyd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'" - hostgroups: squeeze, wheezy + hostgroups: squeeze, wheezy, jessie excludehostgroups: freebsd, alioth # }}} # {{{ anti-services @@ -1905,6 +1926,13 @@ services: servicegroups: raid nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'" hostgroups: sw-raid + excludehostgroups: jessie + - + name: process - mdadm monitor + servicegroups: raid + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --scan'" + hostgroups: sw-raid + hostgroups: jessie - name: RAID - sw raid servicegroups: raid @@ -2623,6 +2651,17 @@ services: hosts: gombert contact_groups: gobby #### + - + name: network service - sip-tls cert - 443 + check: dsa_check_cert!443 + normal_check_interval: 60 + hosts: vogler + - + name: network service - sip-tls cert - 5061 + check: dsa_check_cert!5061 + normal_check_interval: 60 + hosts: vogler + #### - name: puppetmaster cert nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"