[checkmk-commits] Check_MK Git: check_mk: diskstat: fix summary mode, fix aix_diskiod

Module: check_mk Branch: master Commit: 0f669c3222eea95b2667f1ea8c5d55a5ed431f9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f669c3222eea9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 12 15:45:30 2014 +0200 diskstat: fix summary mode, fix aix_diskiod --- checks/aix_diskiod | 5 +++-- checks/diskstat.include | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/aix_diskiod b/checks/aix_diskiod index e10224c..cd250e4 100644 --- a/checks/aix_diskiod +++ b/checks/aix_diskiod @@ -46,8 +46,8 @@ def aix_diskiod_convert(info): converted = [] - for device, tm_act, kbps, tps, kb_read, kb_written in info: - converted.append((device, int(kb_read) * 1024, int(kb_written) * 1024)) + for node_info, device, tm_act, kbps, tps, kb_read, kb_written in info: + converted.append((node_info, device, int(kb_read) * 1024, int(kb_written) * 1024)) return converted @@ -63,6 +63,7 @@ check_info["aix_diskiod"] = { 'inventory_function': inventory_aix_diskiod, 'service_description': 'Disk IO %s', 'has_perfdata': True, + 'node_info': True, 'group': 'disk_io', 'includes': [ "diskstat.include" ], } diff --git a/checks/diskstat.include b/checks/diskstat.include index 015acce..6d2690e 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -224,7 +224,7 @@ def check_diskstat_generic(item, params, this_time, info, mode='sectors'): if ' ' in devname: continue summary_line = map(lambda e: e[0] + int(e[1]), zip(summary_line, line[2:])) - return check_diskstat_line(this_time, "SUMMARY", params, [''] + summary_line, mode) + return check_diskstat_line(this_time, "SUMMARY", params, [None, ''] + summary_line, mode) # single mode result = ""