[checkmk-commits] Revert "6077 FIX ps: Using number of cores sent by Linux agent is now configurable"

Module: check_mk Branch: master Commit: 216c0528ed97bf5a605dd0203996b795114991d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=216c0528ed97bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 11:44:08 2018 +0200 Revert "6077 FIX ps: Using number of cores sent by Linux agent is now configurable" This reverts commit e8cdc365bc57ef65455ddff71fb5203a18812909. Change-Id: Iee44c5ef7d6cbd1c5e62d291d8ec2fbde4e27cf8 --- .werks/6077 | 11 ----------- checks/ps | 2 +- web/plugins/wato/check_parameters.py | 4 ---- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.werks/6077 b/.werks/6077 deleted file mode 100644 index ecd0ba9..0000000 --- a/.werks/6077 +++ /dev/null @@ -1,11 +0,0 @@ -Title: ps: Using number of cores sent by Linux agent is now configurable -Level: 1 -Component: checks -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.5.0b4 -Date: 1526028276 - - diff --git a/checks/ps b/checks/ps index 52eec64..9489fc7 100644 --- a/checks/ps +++ b/checks/ps @@ -242,7 +242,7 @@ def inventory_ps(info): 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 and params.get('use_linux_cpu_cores'): + if cpu_info and len(cpu_info[0]) == 6: cpu_cores = int(cpu_info[0][5]) if mem_info: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 875b364..2092288 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1345,10 +1345,6 @@ process_level_elements = [ ), ], )), - ("use_linux_cpu_cores", Checkbox( - title=_("Use number of cores sent by agent (Linux)"), - label=_("Enable") - )), ('process_info', DropdownChoice( title = _("Enable per-process details in long-output"), label = _("Enable per-process details"),