[checkmk-commits] Check_MK Git: check_mk: brocade_fcport: fixed error in pnp-template

Module: check_mk Branch: master Commit: 5f99688f6e000035f5c846c6a496b7bd860d330f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f99688f6e0000… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 19 14:11:39 2013 +0100 brocade_fcport: fixed error in pnp-template --- .werks/246 | 10 +++++++++ ChangeLog | 1 + pnp-templates/check_mk-brocade_fcport.php | 34 ++++++++++++++--------------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.werks/246 b/.werks/246 new file mode 100644 index 0000000..3b9e1fd --- /dev/null +++ b/.werks/246 @@ -0,0 +1,10 @@ +Title: brocade_fcport: fixed error in pnp-template +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387458091 +Targetversion: future + +Error was caused through a duplicate definition of a parameter. diff --git a/ChangeLog b/ChangeLog index 880c76d..502d5ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * 0368 FIX: Generating selection id is hopefully now compatible to more systems... * 0374 FIX: Fixed syntax error in exception handler of LDAP search code... * 0375 FIX: LDAP: Now handling user-ids with umlauts... + * 0246 FIX: brocade_fcport: fixed error in pnp-template... * 0393 FIX: LDAP: Enabled paged LDAP search by default now with a page size of 1000... WATO: diff --git a/pnp-templates/check_mk-brocade_fcport.php b/pnp-templates/check_mk-brocade_fcport.php index 0cb19ab..15eac8f 100644 --- a/pnp-templates/check_mk-brocade_fcport.php +++ b/pnp-templates/check_mk-brocade_fcport.php @@ -66,23 +66,23 @@ $def[1] = "" if (isset($RRD['in_avg'])) { $def[1] .= "" - . "DEF:inavg=$RRD[in_avg] " - . "DEF:outavg=$RRD[out_avg] " - . "CDEF:inavgmb=inavg,1048576,/ " - . "CDEF:outavgmb=outavg,1048576,/ " - . "DEF:inavgavg=$RRDAVG[in_avg] " - . "DEF:outavgavg=$RRDAVG[out_avg] " - . "CDEF:inavgmbavg=inavgavg,1048576,/ " - . "CDEF:outavgmbavg=outavgavg,1048576,/ " - . "CDEF:outavgmbdraw=outavg,-1048576,/ " - . "LINE:inavgmb#a0d040:\"in (avg) \" " - . "GPRINT:inavgmb:LAST:\"%5.3lf MB/s last\" " - . "GPRINT:inavgmbavg:AVERAGE:\"%5.3lf MB/s avg\" " - . "GPRINT:inavgmb:MAX:\"%5.3lf MB/s max\\n\" " - . "LINE:outavgmbdraw#40a0d0:\"out (avg)\" " - . "GPRINT:outavgmb:LAST:\"%5.3lf MB/s last\" " - . "GPRINT:outavgmbavg:AVERAGE:\"%5.3lf MB/s avg\" " - . "GPRINT:outavgmb:MAX:\"%5.3lf MB/s max\\n\" " + . "DEF:inaverage=$RRD[in_avg] " + . "DEF:outaverage=$RRD[out_avg] " + . "CDEF:inaveragemb=inaverage,1048576,/ " + . "CDEF:outaveragemb=outaverage,1048576,/ " + . "DEF:inaverage_avg=$RRDAVG[in_avg] " + . "DEF:outaverage_avg=$RRDAVG[out_avg] " + . "CDEF:inaveragemb_avg=inaverage_avg,1048576,/ " + . "CDEF:outaveragemb_avg=outaverage_avg,1048576,/ " + . "CDEF:outaveragemb_draw=outaverage,-1048576,/ " + . "LINE:inaveragemb_avg#a0d040:\"in (avg) \" " + . "GPRINT:inaveragemb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:inaveragemb_avg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:inaveragemb:MAX:\"%5.3lf MB/s max\\n\" " + . "LINE:outaveragemb_draw#40a0d0:\"out (avg)\" " + . "GPRINT:outaveragemb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:outaveragemb_avg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:outaveragemb:MAX:\"%5.3lf MB/s max\\n\" " ; }