X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=bc2772cc327e2f50f487eac87c1efd9d48252d5c;hb=68088daeba2eb65859c9c29418d0fb070c977199;hp=74e835d413dd17c8a5a91e343265d31b4ba406f5;hpb=7cd1a0ab18444bc05f872c1d8779c86fc3923cb4;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 74e835d..bc2772c 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -77,7 +77,7 @@ servers: parents: gw-ubc hostgroups: routing-infrastructure gw-sanger: - address: 193.62.202.18 + address: 193.62.202.20 parents: gw-ubc hostgroups: routing-infrastructure contacts: tjrc1 @@ -168,6 +168,15 @@ servers: address: 86.59.118.145 parents: gw-ubc hostgroups: routing-infrastructure + gw-arm: + address: 82.44.141.46 + parents: gw-ubc + hostgroups: routing-infrastructure + gw-ynic: + # really janet, because ynic is stupid about firewalling + address: 146.97.42.26 + parents: gw-ubc + hostgroups: routing-infrastructure global: hostgroups: notacomputer @@ -274,10 +283,10 @@ servers: address: 82.195.75.70 parents: gw-man-da hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers - purcell: - address: 82.195.75.69 + kokkonen: + address: 82.195.75.97 parents: gw-man-da - hostgroups: computers, buildd + hostgroups: computers, service, acpid-hosts, postgres84-hosts master: address: 70.103.162.29 @@ -303,10 +312,10 @@ servers: address: 140.211.166.78 parents: gw-osuosl hostgroups: computers, buildd, hasbootfs - mayr: - address: 140.211.166.58 - parents: gw-osuosl - hostgroups: computers, buildd, hasbootfs +# mayr: +# address: 140.211.166.58 +# parents: gw-osuosl +# hostgroups: computers, buildd, hasbootfs rietz: address: 140.211.166.43 parents: gw-osuosl @@ -400,7 +409,7 @@ servers: sibelius: address: 193.62.202.28 parents: gw-sanger - hostgroups: computers, acpid-hosts, megaraid + hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts contacts: tjrc1 smetana: address: 193.62.202.29 @@ -498,6 +507,7 @@ servers: hostgroups: computers, bl460, acpid-hosts tchaikovsky: address: 206.12.19.118 + address6: 2607:f8f0:610:4000:216:36ff:fe40:3809 hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains wolkenstein: address: 206.12.19.116 @@ -575,6 +585,18 @@ servers: address: 206.12.19.15 parents: tchaikovsky hostgroups: computers, buildd + rossini: + address: 206.12.19.19 + parents: tchaikovsky + hostgroups: computers, dl585, acpid-hosts + salieri: + address: 206.12.19.20 + parents: tchaikovsky + hostgroups: computers, dl585, acpid-hosts + traetta: + address: 206.12.19.21 + parents: tchaikovsky + hostgroups: computers, dl585, acpid-hosts lebrun: address: 193.198.184.10 @@ -666,11 +688,11 @@ servers: vitry: address: 194.177.211.206 parents: gw-grnet - hostgroups: computers, acpid-hosts, mptraid + hostgroups: computers, acpid-hosts, mptraid, buildd krenek: address: 194.177.211.207 parents: gw-grnet - hostgroups: computers, acpid-hosts, mptraid + hostgroups: computers, acpid-hosts, mptraid, buildd scelsi: address: 194.177.211.208 parents: gw-grnet @@ -708,6 +730,39 @@ servers: hostgroups: computers, acpid-hosts # which raid? + abel: + address: 217.140.96.56 + parents: gw-arm + hostgroups: computers, hasbootfs, hassrvfs, porterbox + arnold: + address: 217.140.96.57 + parents: gw-arm + hostgroups: computers, hasbootfs, hassrvfs, buildd + alain: + address: 217.140.96.58 + parents: gw-arm + hostgroups: computers, hasbootfs, hassrvfs, buildd + alwyn: + address: 217.140.96.59 + parents: gw-arm + hostgroups: computers, hasbootfs, hassrvfs, buildd + antheil: + address: 217.140.96.60 + parents: gw-arm + hostgroups: computers, hasbootfs, hassrvfs, buildd + arne: + address: 217.140.96.61 + parents: gw-arm + hostgroups: computers, hasbootfs, hassrvfs + + poulenc: + address: 144.32.168.77 + parents: gw-ynic + hostgroups: computers, buildd, sw-raid, hassrvfs + porpora: + address: 144.32.168.78 + parents: gw-ynic + hostgroups: computers, buildd, sw-raid, hassrvfs ############################# # host groups @@ -768,6 +823,9 @@ hostgroups: bl460: alias: HP BL460 blades private: 1 + dl585: + alias: HP DL385 hosts + private: 1 sw-raid: alias: Hosts with Linux software raid private: 1 @@ -1138,6 +1196,11 @@ services: nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf" hostgroups: computers excludehostgroups: freebsd + - + name: puppetized firewall + nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf" + hostgroups: computers + excludehostgroups: freebsd #### - @@ -1626,12 +1689,12 @@ services: name: process - cpqarrayd servicegroups: raid nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'" - hostgroups: dl385, dl380, dl360, bl460 + hostgroups: dl385, dl380, dl360, bl460, dl585 - name: RAID - arrayprobe servicegroups: raid nrpe: "sudo /usr/bin/arrayprobe" - hostgroups: dl385, dl380, dl360, bl460 + hostgroups: dl385, dl380, dl360, bl460, dl585 excludehosts: franck - name: RAID - arrayprobe @@ -1644,12 +1707,18 @@ services: nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli" normal_check_interval: 120 hostgroups: dl385, dl380, dl360, bl460 + - + name: HW - hpacucli status + servicegroups: raid + nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2" + normal_check_interval: 120 + hostgroups: dl585 ### - name: HW - hpasmcli status nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm" normal_check_interval: 120 - hostgroups: dl385, dl380, dl360, bl460 + hostgroups: dl385, dl380, dl360, bl460, dl585 excludehosts: villa, lobos, liszt, senfl, schein, rore - name: HW - hpasmcli status @@ -1920,9 +1989,8 @@ services: #### - name: process - postresql84 - master - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'" + nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'" hostgroups: postgres84-hosts - excludehosts: franck - name: process - postresql83 - master nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"