[checkmk-commits] Fix CPU utilization regarding Linux processes in ps check

Module: check_mk Branch: master Commit: 82add2dd8741a16bfa46a330e940382dc9cdd6e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82add2dd8741a1… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Feb 22 13:02:21 2018 +0100 Fix CPU utilization regarding Linux processes in ps check Change-Id: I1b21836dca3175b632e32f0c93b85b146d6e16e4 --- checks/ps | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/checks/ps b/checks/ps index 74f97f9..9489fc7 100644 --- a/checks/ps +++ b/checks/ps @@ -236,12 +236,15 @@ def parse_ps(info): def inventory_ps(info): - (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info = info + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info, cpu_info = info return inventory_ps_common(inventory_processes, inventory_processes_rules, parsed) def check_ps(item, params, info): - (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info = info + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info, cpu_info = info + if cpu_info and len(cpu_info[0]) == 6: + cpu_cores = int(cpu_info[0][5]) + if mem_info: total_ram = parse_proc_meminfo_bytes(mem_info).get("MemTotal") elif solaris_mem_info: @@ -266,7 +269,7 @@ check_info['ps'] = { "node_info" : True, # add first column with actual host name "group" : "ps", "default_levels_variable" : "ps_default_levels", - "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory", "cpu" ], } # NOTE: This check is deprecated and will be removed any decade now. ps now @@ -279,5 +282,5 @@ check_info['ps.perf'] = { "node_info" : True, # add first column with actual host name "group" : "ps", "default_levels_variable" : "ps_default_levels", - "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory", "cpu" ], }