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

Module: check_mk Branch: master Commit: 6cef608aec33ea7490e2e62e569fe20cb3177876 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cef608aec33ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 11:44:12 2018 +0200 Revert "Fix CPU utilization regarding Linux processes in ps check" This reverts commit 82add2dd8741a16bfa46a330e940382dc9cdd6e4. --- checks/ps | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/checks/ps b/checks/ps index 9489fc7..74f97f9 100644 --- a/checks/ps +++ b/checks/ps @@ -236,15 +236,12 @@ def parse_ps(info): def inventory_ps(info): - (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info, cpu_info = info + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_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, cpu_info = info - if cpu_info and len(cpu_info[0]) == 6: - cpu_cores = int(cpu_info[0][5]) - + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info = info if mem_info: total_ram = parse_proc_meminfo_bytes(mem_info).get("MemTotal") elif solaris_mem_info: @@ -269,7 +266,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", "cpu" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], } # NOTE: This check is deprecated and will be removed any decade now. ps now @@ -282,5 +279,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", "cpu" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], }