Module: check_mk Branch: master Commit: 62a61cbdead5a25bbaa6db0edb5832aedcec3f1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62a61cbdead5a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 28 10:12:09 2015 +0200 #2494 FIX Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 --- .werks/2494 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2494 b/.werks/2494 new file mode 100644 index 0000000..90d7c0c --- /dev/null +++ b/.werks/2494 @@ -0,0 +1,10 @@ +Title: Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438071098 + + diff --git a/ChangeLog b/ChangeLog index 1901761..871aef7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 2476 FIX: check_bi_aggr: Fixed exception when authentication is enabled * 2477 FIX: SNMP: Fixed exception when processing specific SNMP data with missing columns... * 1274 FIX: heartbeat_crm: Handle case of error messages from CRM + * 2494 FIX: Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/modules/check_mk.py b/modules/check_mk.py index 1998b62..ee7dd36 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -722,8 +722,10 @@ def snmp_base_command(what, hostname): command = 'snmpget' elif what == 'getnext': command = 'snmpgetnext -Cf' - else: + elif is_bulkwalk_host(hostname): command = 'snmpbulkwalk' + else: + command = 'snmpwalk' # Handle V1 and V2C if type(credentials) in [ str, unicode ]: