[checkmk-commits] #2675 FIX checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices

Module: check_mk Branch: master Commit: 35d2ed8d6ae2a0eb103f3ca27bb85be4a79b9f06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35d2ed8d6ae2a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 9 08:51:20 2015 +0200 #2675 FIX checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices --- .werks/2675 | 9 +++++++++ ChangeLog | 1 + checks/checkpoint.include | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/2675 b/.werks/2675 new file mode 100644 index 0000000..4850895 --- /dev/null +++ b/.werks/2675 @@ -0,0 +1,9 @@ +Title: checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1444373412 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index bc8ee0c..c21e520 100644 --- a/ChangeLog +++ b/ChangeLog @@ -214,6 +214,7 @@ * 2619 FIX: services_summary: Fixed exception on WATO services summary page * 2654 FIX: logwatch: fixed high memory and cpu usage caused by too many unacknowledged messages... * 2622 FIX: postfix_mailq: Fixed exception when postfix is installed but not configured properly + * 2675 FIX: checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/checkpoint.include b/checks/checkpoint.include index 7155e99..3d58994 100644 --- a/checks/checkpoint.include +++ b/checks/checkpoint.include @@ -26,7 +26,7 @@ def scan_checkpoint(oid): - sys_descr = oid(".1.3.6.1.2.1.1.1.0") + sys_descr = oid(".1.3.6.1.2.1.1.1.0", "") return ( # Entry in sysDescr, varies a bit (len(sys_descr.split(" ")) >= 3 and sys_descr.split(" ")[2].endswith("cp")) or @@ -34,4 +34,4 @@ def scan_checkpoint(oid): (sys_descr.startswith("Linux") and "cpx" in sys_descr)) \ and \ - oid(".1.3.6.1.4.1.2620.1.1.21.0").lower().startswith('firewall') + oid(".1.3.6.1.4.1.2620.1.1.21.0", "").lower().startswith('firewall')