[checkmk-commits] fixed ucd_scan_function: conflicts with hr-checks

Module: check_mk Branch: master Commit: e560325fd534627c5ce534641919fb95a842615a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e560325fd53462… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 12 16:15:04 2015 +0200 fixed ucd_scan_function: conflicts with hr-checks --- checks/ucd.include | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/checks/ucd.include b/checks/ucd.include index 4863e0d..eaffa92 100644 --- a/checks/ucd.include +++ b/checks/ucd.include @@ -32,12 +32,14 @@ def ucd_scan_function(oid): - return ("linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ - "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") or \ - "HP Onboard Administrator" in oid(".1.3.6.1.2.1.1.1.0") or \ - # for barracuda spam firewall appliance - "barracuda" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ - # for artec email archiv appliance - ( oid('.1.3.6.1.2.1.1.2.0') == '.1.3.6.1.4.1.8072.3.2.10' and \ - "version" in oid('.1.3.6.1.2.1.1.1.0').lower() and \ - "serial" in oid('.1.3.6.1.2.1.1.1.0').lower() )) + return (("linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") or \ + "HP Onboard Administrator" in oid(".1.3.6.1.2.1.1.1.0") or \ + # for barracuda spam firewall appliance + "barracuda" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + # for artec email archiv appliance + ( oid('.1.3.6.1.2.1.1.2.0') == '.1.3.6.1.4.1.8072.3.2.10' and \ + "version" in oid('.1.3.6.1.2.1.1.1.0').lower() and \ + "serial" in oid('.1.3.6.1.2.1.1.1.0').lower() )) and \ + # we prefer HOST-RESOURCES-MIB implementation + not oid(".1.3.6.1.2.1.25.1.1.0"))