X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=config%2Fnagios-master.cfg;h=3a039af032329f9dc0cdcf4a7ec260eb893ae4d7;hb=cfed440f0a01fafc964caa9927d4acc67032e357;hp=d2e82eeeec70ea560bfc6d08292a024015d27575;hpb=8f5f89fe188717ed341e51a2b99f369077a25502;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index d2e82ee..3a039af 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -222,7 +222,7 @@ servers: mips-aql-01: address: 141.170.6.149 parents: gw-aql - hostgroups: computers, buildd, wheezy, nfs-client + hostgroups: computers, buildd, jessie, nfs-client mips-aql-02: address: 141.170.6.150 parents: gw-aql @@ -268,7 +268,7 @@ servers: hoiby: address: 217.140.96.71 parents: gw-arm - hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, broken_mq + hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd, broken_mq ia64-arm-01: address: 217.140.96.61 parents: gw-arm @@ -464,7 +464,7 @@ servers: hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client fede: address: 5.153.231.37 - hostgroups: computers, service, kvmdomains, wheezy, hassrvfs + hostgroups: computers, service, kvmdomains, jessie, hassrvfs sor: address: 5.153.231.38 parents: ganeti-bytemark @@ -504,10 +504,6 @@ servers: hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc # }}} # {{{ gw-csail - senfl: - address: 128.31.0.51 - parents: gw-csail - hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, squeeze, apache-https steffani: address: 128.31.0.36 parents: gw-csail @@ -584,6 +580,10 @@ servers: address: 194.177.211.202 parents: gw-grnet hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https + x86-grnet-01: + address: 194.177.211.203 + parents: ganeti-grnet + hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie # }}} # {{{ gw-isc schein: @@ -1035,11 +1035,15 @@ servers: powerpc-unicamp-01: address: 143.106.167.149 parents: prokofiev - hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy + hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie ppc64el-unicamp-01: address: 143.106.167.135 parents: prokofiev hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie + plummer: + address: 143.106.167.146 + parents: prokofiev + hostgroups: computers, porterbox, hassrvfs, jessie # }}} # {{{ gw-utwente klecker: @@ -1183,8 +1187,6 @@ hostgroups: alias: Hosts with LSI Logic MegaRAID private: 1 - squeeze: - alias: Hosts running squeeze wheezy: alias: Hosts running wheezy jessie: @@ -1812,21 +1814,17 @@ services: name: process - ud-replicated nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C ud-replicated -a '/usr/bin/python /usr/bin/ud-replicated'" hostgroups: computers - excludehostgroups: squeeze, freebsd, alioth + excludehostgroups: freebsd, alioth - name: process - ud-replicated nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C python2.7 -a '/usr/bin/python /usr/bin/ud-replicated'" hostgroups: freebsd ### - - - 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: 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: computers - excludehostgroups: squeeze, alioth, jessie + excludehostgroups: alioth, jessie ### - name: MQ connection on rainier @@ -1900,8 +1898,14 @@ 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, jessie + hostgroups: wheezy, jessie + excludehostgroups: freebsd, alioth + - + name: process - stunnel4 - puppet-ekeyd is crazy + nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity" + hostgroups: computers excludehostgroups: freebsd, alioth + excludehosts: czerny, grnet-node01, storace # }}} # {{{ anti-services - @@ -1941,6 +1945,14 @@ services: name: "host SSL cert" nrpe: "if [ -e /etc/ssl/certs/thishost.pem ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/thishost.pem; else echo 'No thishost.pem on this host.'; fi" hostgroups: computers + - + name: "host SSL cert - debian server" + nrpe: "if [ -e /etc/ssl/debian/certs/thishost-server.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost-server.crt; else echo 'No thishost-server.crt on this host.'; fi" + hostgroups: computers + - + name: "host SSL cert - debian client" + nrpe: "if [ -e /etc/ssl/debian/certs/thishost.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost.crt; else echo 'No thishost.crt on this host.'; fi" + hostgroups: computers # }}} # {{{ HW health/raid - @@ -2004,13 +2016,13 @@ services: # nrpe: "/usr/lib/nagios/plugins/dsa-check-edac" # normal_check_interval: 120 #hostgroups: computers - #excludehosts: villa, lobos, senfl, schein + #excludehosts: villa, lobos, schein - name: HW - hpasmcli status nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm" normal_check_interval: 120 hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl - excludehosts: villa, lobos, senfl, schein, storace + excludehosts: villa, lobos, schein, storace - name: HW - hpasmcli status nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant" @@ -2025,7 +2037,7 @@ services: name: HW - hpasmcli status nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant" normal_check_interval: 120 - hosts: senfl, schein + hosts: schein - name: HW - hpasmcli status nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"