X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=2a64c627aaf1e6f145aaf7e078d69cb2a4f8dbe4;hb=b53f738f4cee9b2c14db2f7372a6737bdaa922ab;hp=d5b89f7b7c568194d985fe2f667c0337a78ec921;hpb=8c159cf027279c1be6c2156531bb4be88c2cf8cb;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index d5b89f7..2a64c62 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -224,6 +224,10 @@ servers: address: 217.140.96.66 parents: gw-arm hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, deadslow + hartmann: + address: 217.140.96.67 + parents: gw-arm + hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow hasse: address: 217.140.96.68 parents: gw-arm @@ -257,35 +261,35 @@ servers: bm-bl1: address: 5.153.231.241 parents: gw-bytemark - hostgroups: computers, bl460, acpid-hosts, service, wheezy + hostgroups: computers, bm-bl, acpid-hosts, service, wheezy bm-bl2: address: 5.153.231.242 parents: gw-bytemark - hostgroups: computers, bl460, acpid-hosts, service, wheezy + hostgroups: computers, bm-bl, acpid-hosts, service, wheezy bm-bl3: address: 5.153.231.243 parents: gw-bytemark - hostgroups: computers, bl460, acpid-hosts, service, wheezy + hostgroups: computers, bm-bl, acpid-hosts, service, wheezy bm-bl4: address: 5.153.231.244 parents: gw-bytemark - hostgroups: computers, bl460, acpid-hosts, service, wheezy + hostgroups: computers, bm-bl, acpid-hosts, service, wheezy bm-bl5: address: 5.153.231.245 parents: gw-bytemark - hostgroups: computers, bl460, acpid-hosts, service, wheezy + hostgroups: computers, bm-bl, acpid-hosts, service, wheezy bm-bl6: address: 5.153.231.246 parents: gw-bytemark - hostgroups: computers, bl460, acpid-hosts, service, wheezy + hostgroups: computers, bm-bl, acpid-hosts, service, wheezy bm-bl7: address: 5.153.231.247 parents: gw-bytemark - hostgroups: computers, bl460, acpid-hosts, service, wheezy + hostgroups: computers, bm-bl, acpid-hosts, service, wheezy bm-bl8: address: 5.153.231.248 parents: gw-bytemark - hostgroups: computers, bl460, acpid-hosts, service, wheezy + hostgroups: computers, bm-bl, acpid-hosts, service, wheezy milanollo: address: 5.153.231.2 @@ -333,7 +337,7 @@ servers: schroeder: address: 193.198.184.11 parents: gw-carnet - hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze + hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, wheezy # }}} # {{{ gw-cecsit gluck: @@ -399,7 +403,7 @@ servers: biber: address: 194.177.211.204 parents: gw-grnet - hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy, bacula-client + hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy cilea: address: 194.177.211.205 parents: gw-grnet @@ -585,10 +589,6 @@ servers: address: 140.211.15.152 parents: gw-osuosl hostgroups: computers, wheezy, hassrvfs - piston: - address: 140.211.15.154 - parents: gw-osuosl - hostgroups: computers, wheezy, hassrvfs rietz: address: 140.211.166.43 parents: gw-osuosl @@ -902,7 +902,7 @@ servers: menotti: address: 206.12.19.143 parents: ganeti2 - hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts + hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts #, apache-https coincy: address: 206.12.19.144 @@ -1041,6 +1041,9 @@ hostgroups: bl460: alias: HP BL460 blades private: 1 + bm-bl: + alias: HP blades at bytemark + private: 1 dl585: alias: HP DL385 hosts private: 1 @@ -2016,11 +2019,6 @@ services: nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd" hostgroups: computers excludehostgroups: deadslow - - - name: unwanted process - portmap - nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C portmap" - hostgroups: computers - excludehostgroups: nfs-client, nfs-server, deadslow - name: unwanted process - rpc.statd nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd" @@ -2092,13 +2090,19 @@ services: nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli" normal_check_interval: 120 hostgroups: dl385, dl380, dl360, bl460 - excludehosts: schein + excludehosts: schein, rietz + - + name: HW - hpacucli status + servicegroups: raid + nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'" + normal_check_interval: 120 + hostgroups: bm-bl - name: HW - hpacucli status servicegroups: raid nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery" normal_check_interval: 120 - hosts: schein + hosts: schein, rietz - name: HW - hpacucli enclosure status servicegroups: raid @@ -2116,7 +2120,7 @@ services: name: HW - hpasmcli status nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm" normal_check_interval: 120 - hostgroups: dl385, dl380, dl360, bl460, dl585 + hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl excludehosts: villa, lobos, senfl, schein - name: HW - hpasmcli status @@ -2130,9 +2134,9 @@ services: hosts: senfl, schein ### - - name: RAID - areca + name: RAID - 3ware servicegroups: raid - nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-areca" + nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware" hosts: powell ### - @@ -2476,14 +2480,14 @@ services: name: process - buildd servicegroups: buildd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'" - hosts: fano, fasch, finzi, fils + hosts: fano, fasch, finzi, fils, fayrfax contact_groups: buildd - name: process - buildd servicegroups: buildd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'" hostgroups: buildd - excludehosts: fano, fasch, finzi, fils + excludehosts: fano, fasch, finzi, fils, fayrfax contact_groups: buildd - name: processes - zombie schroot @@ -2512,11 +2516,6 @@ services: ############ NFS Stuff ############ #### - - - name: process - portmap - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C portmap -a '/sbin/portmap'" - hostgroups: nfs-client, nfs-server - excludehostgroups: wheezy - name: process - statd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"