Module: check_mk Branch: master Commit: db4d58c1d31d28a9f99145d11bfa8bfc1be9cebd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db4d58c1d31d28… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jun 27 16:44:28 2014 +0200 FIX hp_blade_psu: Fixed pnp template Fixed pnp template in order to work with rrd storage type multipe --- .werks/171 | 8 ++++++++ ChangeLog | 3 ++- pnp-templates/check_mk-hp_blade_psu.php | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/171 b/.werks/171 new file mode 100644 index 0000000..585bf46 --- /dev/null +++ b/.werks/171 @@ -0,0 +1,8 @@ +Title: hp_blade_psu: Fixed pnp template +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1403880223 +Class: fix + +Fixed pnp template in order to work with rrd storage type multipe diff --git a/ChangeLog b/ChangeLog index 4918135..40a70aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,13 +7,14 @@ * 0168 f5_bigip_pool: Added Wato configuration... * 0995 raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs * 0169 websphere_mq_channels,ebsphere_mq_queues: New Checks to monitor IBM Websphere MQ Queues and Channels... - * 0170 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards * 1034 Always provide also 64 bit version of Windows agent + * 0170 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... * 0944 FIX: oracle_tablespaces: fixed calculation of space left and number of remaining increments... * 1032 FIX: check_traceroute: Fix option Use DNS, worked vice versa + * 0171 FIX: hp_blade_psu: Fixed pnp template... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/pnp-templates/check_mk-hp_blade_psu.php b/pnp-templates/check_mk-hp_blade_psu.php index 9a6e77d..e8ff6d0 100644 --- a/pnp-templates/check_mk-hp_blade_psu.php +++ b/pnp-templates/check_mk-hp_blade_psu.php @@ -34,7 +34,7 @@ function getAllPsuFiles($path) { $files = array(); if($h = opendir($path)) { while(($file = readdir($h)) !== false) { - if(preg_match('/^PSU_[0-9]+\.rrd$/', $file, $aRet)) + if(preg_match('/^PSU_[0-9]+_output\.rrd$/', $file, $aRet)) $files[] = $aRet[0]; } natcasesort($files);