[checkmk-commits] Check_MK Git: check_mk: cisco_qos: pnp template coloring. added perfometer. fixed unit conversion(base 1000)

Module: check_mk Branch: master Commit: 2594bb5e3c300a3624a30d00c7de7f63b30efaad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2594bb5e3c300a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 8 15:41:07 2013 +0100 cisco_qos: pnp template coloring. added perfometer. fixed unit conversion(base 1000) --- pnp-templates/check_mk-cisco_qos.php | 6 +++--- web/plugins/perfometer/check_mk.py | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pnp-templates/check_mk-cisco_qos.php b/pnp-templates/check_mk-cisco_qos.php index f74f417..c7ff952 100644 --- a/pnp-templates/check_mk-cisco_qos.php +++ b/pnp-templates/check_mk-cisco_qos.php @@ -47,7 +47,7 @@ if($bandwidth > $base * $base * $base) { } $ds_name[1] = 'QoS Class Traffic'; -$opt[1] = "--vertical-label \"MBit/sec\" -X0 -b 1024 --title \"$hostname / $servicedesc\" "; +$opt[1] = "--vertical-label \"MBit/sec\" -X0 -b 1000 --title \"$hostname / $servicedesc\" "; $def[1] = "HRULE:0#c0c0c0 ". "HRULE:$bandwidth#808080:\"Interface speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s\\n\" ". @@ -76,11 +76,11 @@ $def[1] .= "DEF:postbytes_avg=$RRDFILE[3]:$DS[1]:MAX ". "CDEF:drop_traffic_avg=dropbytes_avg,8,* ". "CDEF:postmbit_avg=post_traffic_avg,1000000,/ ". "CDEF:dropmbit_avg=drop_traffic_avg,1000000,/ ". - "LINE:postmbit_avg#a3f090:\"post avg \" ". + "LINE:postmbit_avg#3b762e:\"post avg \" ". "GPRINT:post_traffic_avg:LAST:\"%5.1lf %sBit/s last\" ". "GPRINT:post_traffic_avg:AVERAGE:\"%5.1lf %sBit/s avg\" ". "GPRINT:post_traffic_avg:MAX:\"%5.1lf %sBit/s max\\n\" ". - "LINE:dropmbit_avg#6030f0:\"drop avg \" ". + "LINE:dropmbit_avg#1255a9:\"drop avg \" ". "GPRINT:drop_traffic_avg:LAST:\"%5.1lf %sBit/s last\" ". "GPRINT:drop_traffic_avg:AVERAGE:\"%5.1lf %sBit/s avg\" ". "GPRINT:drop_traffic_avg:MAX:\"%5.1lf %sBit/s max\\n\" "; diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index a8ea017..12612db 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -300,6 +300,16 @@ def perfometer_check_mk_brocade_fcport(row, check_command, perf_data): out_bw = savefloat(perf_data[1][6]), ) +def perfometer_check_mk_cisco_qos(row, check_command, perf_data): + unit = "Bit/s" in row["service_plugin_output"] and "Bit" or "B" + return perfometer_bandwidth( + in_traffic = savefloat(perf_data[0][1]), + out_traffic = savefloat(perf_data[1][1]), + in_bw = savefloat(perf_data[0][5]) , + out_bw = savefloat(perf_data[1][5]) , + unit = unit + ) + perfometers["check_mk-if"] = perfometer_check_mk_if perfometers["check_mk-if64"] = perfometer_check_mk_if perfometers["check_mk-vms_if"] = perfometer_check_mk_if @@ -308,6 +318,7 @@ perfometers["check_mk-lnx_if"] = perfometer_check_mk_if perfometers["check_mk-hpux_if"] = perfometer_check_mk_if perfometers["check_mk-mcdata_fcport"] = perfometer_check_mk_if perfometers["check_mk-brocade_fcport"] = perfometer_check_mk_brocade_fcport +perfometers["check_mk-cisco_qos"] = perfometer_check_mk_cisco_qos def perfometer_oracle_tablespaces(row, check_command, perf_data): current = float(perf_data[0][1])