[checkmk-commits] Added node_name to get_rate key

Module: check_mk Branch: master Commit: 1ba1a692e434370bda523a832983c3ed4dd651d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ba1a692e43437… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 22 15:26:54 2018 +0100 Added node_name to get_rate key Change-Id: I70b3259548cf000aca1369e6414f32d01c0d8bbd --- checks/mssql_counters | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/mssql_counters b/checks/mssql_counters index c13c27d..b4efa67 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -251,7 +251,7 @@ def check_mssql_counters_transactions(item, params, parsed): if value is None: continue - rate = get_rate("mssql_counters.transactions.%s.%s" % (item, counter_key), now, value) + rate = get_rate("mssql_counters.transactions.%s.%s.%s" % (node_name, item, counter_key), now, value) infotext = "%s%s: %.1f/s" % (node_info, title, rate) node_info = "" yield 0, infotext, [(counter_key, rate)] @@ -296,7 +296,7 @@ def check_mssql_counters_locks(item, params, parsed): if value is None: continue - rate = get_rate("mssql_counters.locks.%s.%s" % (item, counter_key), now, value) + rate = get_rate("mssql_counters.locks.%s.%s.%s" % (node_name, item, counter_key), now, value) infotext = "%s%s: %.1f/s" % (node_info, title, rate) node_info = "" @@ -352,7 +352,7 @@ def check_mssql_counters_sqlstats(item, params, parsed): if now is None: now = time.time() - rate = get_rate("mssql_counters.sqlstats.%s.%s" % (item, counter), now, value) + rate = get_rate("mssql_counters.sqlstats.%s.%s.%s" % (node_name, item, counter), now, value) node_info = "" if node_name: node_info = "[%s] " % node_name @@ -410,7 +410,7 @@ def check_mssql_counters_pageactivity(item, params, parsed): if value is None: continue - rate = get_rate("mssql_counters.pageactivity.%s.%s" % (item, counter_key), now, value) + rate = get_rate("mssql_counters.pageactivity.%s.%s.%s" % (node_name, item, counter_key), now, value) infotext = "%s%s: %.1f/s" % (node_info, title, rate) node_info = "" @@ -471,8 +471,8 @@ def check_mssql_counters_locks_per_batch(item, params, parsed): locks = data_locks["lock_requests/sec"] batches = data_stats["batch_requests/sec"] - lock_rate = get_rate("mssql_counters_locks_per_batch.%s.locks" % item, now, locks) - batch_rate = get_rate("mssql_counters_locks_per_batch.%s.batches" % item, now, batches) + lock_rate = get_rate("mssql_counters_locks_per_batch.%s.%s.locks" % (node_name, item), now, locks) + batch_rate = get_rate("mssql_counters_locks_per_batch.%s.%s.batches" % (node_name, item), now, batches) if batch_rate == 0: lock_per_batch = 0