[checkmk-commits] Check_MK Git: check_mk: fixed long output of ps on windows displayed the cpu usage in ticks instead of percent

Module: check_mk Branch: master Commit: e08b01c997307b67c1d9a3c2b9ac2d399f47f1a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e08b01c997307b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Sep 24 13:56:30 2015 +0200 fixed long output of ps on windows displayed the cpu usage in ticks instead of percent --- checks/ps.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index 0dee6b8..e457e53 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -346,8 +346,6 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes", pid, pagefile_usage, user_c, kernel_c, handle_c = map(saveint, addinfo[4:9]) process.append(("pagefile usage", (pagefile_usage, ""))) - process.append(("cpu usage (user space)", (user_c, "%"))) - process.append(("cpu_usage (kernel space)", (kernel_c, "%"))) process.append(("handle count", (handle_c, ""))) counter_wrapped = False @@ -369,6 +367,8 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes", kernel_perc = kernel_per_sec / 100000.0 / cpu_cores percent_cpu += user_perc + kernel_perc handle_count += handle_c + process.append(("cpu usage (user space)", (user_perc, "%"))) + process.append(("cpu_usage (kernel space)", (kernel_perc, "%"))) else: # addinfo[3] contains the used CPU time and possibly, separated by /, also # the total elapsed time since the birth of the process.