[checkmk-commits] #2914 FIX hr_cpu: fixed check not being applied on some systems

Module: check_mk Branch: master Commit: e88cbdfaa0308c6fa118ebc9140be1e5af040577 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e88cbdfaa0308c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jan 7 14:19:21 2016 +0100 #2914 FIX hr_cpu: fixed check not being applied on some systems both hr_cpu and ucd_cpu_util prioritised the other in their scan function so that if both sections were available, neither got used. --- .werks/2914 | 11 +++++++++++ ChangeLog | 1 + checks/hr_cpu | 5 +---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.werks/2914 b/.werks/2914 new file mode 100644 index 0000000..8085e92 --- /dev/null +++ b/.werks/2914 @@ -0,0 +1,11 @@ +Title: hr_cpu: fixed check not being applied on some systems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1452172518 +Class: fix + +both hr_cpu and ucd_cpu_util prioritised the other in their +scan function so that if both sections were available, +neither got used. diff --git a/ChangeLog b/ChangeLog index c11be30..1473f3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -169,6 +169,7 @@ * 2819 FIX: netapp_api_if: now able to detect even more interfaces... * 2820 FIX: winperf_phydisk: fixed invalid performance data for read/write ios * 2887 FIX: docsis_channels_downstream: now handles correct the downstream power in dBmV + * 2914 FIX: hr_cpu: fixed check not being applied on some systems... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/hr_cpu b/checks/hr_cpu index a3bc6a5..f327b66 100644 --- a/checks/hr_cpu +++ b/checks/hr_cpu @@ -49,10 +49,7 @@ check_info["hr_cpu"] = { 'service_description': 'CPU utilization', 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.2.1.25.3.3.1', [2]), - 'snmp_scan_function': lambda oid: \ - not not oid('.1.3.6.1.2.1.25.1.1.0') and not \ - ("linux" in oid(".1.3.6.1.2.1.1.1.0").lower() - and oid(".1.3.6.1.4.1.2021.10.1.6.1")), + 'snmp_scan_function': lambda oid: oid('.1.3.6.1.2.1.25.1.1.0'), 'group': 'cpu_utilization_os', 'includes': [ 'cpu_util.include' ], }