[checkmk-commits] Check_MK Git: check_mk: mem.linux: added Perf-O-Meter

Module: check_mk Branch: master Commit: 94b46da050d5147f07a63daeee1d2d8c7459982e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94b46da050d514… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Dec 29 13:50:37 2014 +0100 mem.linux: added Perf-O-Meter --- web/plugins/perfometer/check_mk.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 08728f2..52ae655 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -181,15 +181,28 @@ perfometers["check_mk-lparstat_aix.cpu_util"] = perfometer_check_mk_kernel_util def perfometer_check_mk_mem_used(row, check_command, perf_data): h = '<table><tr>' - ram_total = float(perf_data[0][6]) - swap_total = float(perf_data[1][6]) - virt_total = ram_total + swap_total + for entry in perf_data: + # Get total and used RAM + if entry[0] == "ramused": + ram_used = float(entry[1]) # mem.include + ram_total = float(entry[6]) # mem.include + elif entry[0] == "mem_used": + ram_used = float(entry[1]) # mem.linux + elif entry[0] == "mem_total": + ram_total = float(entry[1]) # mem.linux + + # Get total and used SWAP + elif entry[0] == "swapused": + swap_used = float(entry[1]) # mem.include + swap_total = float(entry[6]) # mem.include + elif entry[0] == "swap_used": + swap_used = float(entry[1]) # mem.linux + elif entry[0] == "swap_total": + swap_total = float(entry[1]) # mem.linux - ram_used = float(perf_data[0][1]) - swap_used = float(perf_data[1][1]) + virt_total = ram_total + swap_total virt_used = ram_used + swap_used - state = row["service_state"] # paint used ram and swap ram_color, swap_color = "#80ff40", "#008030" h += perfometer_td(100 * ram_used / virt_total, ram_color) @@ -206,12 +219,12 @@ def perfometer_check_mk_mem_used(row, check_command, perf_data): return "%d%%" % (100 * (virt_used / ram_total)), h perfometers["check_mk-mem.used"] = perfometer_check_mk_mem_used +perfometers["check_mk-mem.linux"] = perfometer_check_mk_mem_used perfometers["check_mk-aix_memory"] = perfometer_check_mk_mem_used perfometers["check_mk-hr_mem"] = perfometer_check_mk_mem_used def perfometer_check_mk_mem_win(row, check_command, perf_data): # only show mem usage, do omit page file - state = row["service_state"] color = "#5090c0" ram_total = float(perf_data[0][6]) ram_used = float(perf_data[0][1])