[checkmk-commits] Check_MK Git: check_mk: FIX: check_mk-mssql_counters.transactions: fix computation

Module: check_mk Branch: master Commit: 7d3a34d5fa82f1e9756279c8fbb4592628fb3317 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d3a34d5fa82f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 1 12:19:03 2013 +0200 FIX: check_mk-mssql_counters.transactions: fix computation --- ChangeLog | 1 + checks/mssql_counters | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f246864..0c6316f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ * FIX: check_mk_agent.freebsd: remove garble from output (Thanks to Mathias Decker) * FIX: check_mk-mssql_counters.locks: fix computation, was altogether wrong + * FIX: check_mk-mssql_counters.transactions: fix computation also * check_http: now support the option -L (urlizing the result) Multisite: diff --git a/checks/mssql_counters b/checks/mssql_counters index a50fe5c..0af5dda 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -119,6 +119,8 @@ check_info['mssql_counters.cache_hits'] = { def check_mssql_counters_transactions(item, params, info): output = [] perfdata = [] + now = time.time() + wrapped = False for line in info: if mssql_counters_item(line, False) != item: continue @@ -130,8 +132,14 @@ def check_mssql_counters_transactions(item, params, info): ]: if line[1] == counter: value = int(line[-1]) - output.append('%s: %d/s' % (label, value)) - perfdata.append((counter, value)) + countername = "mssql_counters.%s.%s" % (item, counter) + try: + timedif, persec = get_counter(countername, now, value) + except MKCounterWrapped: + wrapped = True + continue + output.append('%s: %.1f/s' % (label, persec)) + perfdata.append((counter, persec)) if output: return (0, '%s' % ', '.join(output), perfdata)