[checkmk-commits] Check_MK Git: check_mk: #1728 FIX cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor

Module: check_mk Branch: master Commit: 5ac0e5961b9e80adea4d36de40e0277ba6fc49d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ac0e5961b9e80… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 10:02:30 2014 +0100 #1728 FIX cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor --- .werks/1728 | 9 +++++++++ ChangeLog | 1 + checks/cisco_temp_perf | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1728 b/.werks/1728 new file mode 100644 index 0000000..558cda8 --- /dev/null +++ b/.werks/1728 @@ -0,0 +1,9 @@ +Title: cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418115734 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index be00b28..c84e5a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -138,6 +138,7 @@ * 1722 FIX: lnx_thermal: fix invalid zero temperature if mode file is missing * 1696 FIX: cisco_temp_sensor: Value reported of check was not always correct (precision was wrong)... * 1727 FIX: cisco_secure: Fixed inventory exception when port security is not enabled + * 1728 FIX: cisco_temp_perf: Not inventorized anymore for hosts supporting cisco_temp_sensor Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 8547190..899990f 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -91,8 +91,9 @@ check_info['cisco_temp_perf'] = { "service_description" : "Temperature %s", "has_perfdata" : True, "snmp_scan_function" : - lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ - oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None, + lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + and oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None \ + and oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None, "snmp_info" : ( ".1.3.6.1.4.1.9.9.13.1.3.1", [2, 3, 4, 6, OID_END ] ), # CISCO-SMI "group" : "temperature_auto",