[checkmk-commits] Check_MK Git: check_mk: FIX: honor ignored_checktypes also on SNMP scan

Module: check_mk Branch: master Commit: 7bf44150060bd5aadf2ae8afed09e50ed5cde37f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bf44150060bd5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 10 14:26:21 2011 +0200 FIX: honor ignored_checktypes also on SNMP scan --- ChangeLog | 1 + modules/check_mk.py | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d8a241..e57bf8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: honor ignored_checktypes also on SNMP scan * FIX: cmk -II also refreshes cluster checks, if all nodes are specified * FIX: avoid floating points with 'e' in performance data * FIX: cmk -D: drop obsolete (and always empty) Notification: diff --git a/modules/check_mk.py b/modules/check_mk.py index 0857469..2bba92c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -686,6 +686,8 @@ def snmp_scan(hostname, ipaddress): found = [] for checktype, detect_function in snmp_scan_functions.items(): + if checktype in ignored_checktypes: + continue try: if detect_function(lambda oid: get_single_oid(hostname, ipaddress, oid)): found.append(checktype) @@ -697,6 +699,9 @@ def snmp_scan(hostname, ipaddress): # Now try all checks not having a scan function for checktype in check_info.keys(): + if checktype in ignored_checktypes: + continue + datatype = checktype.split('.')[0] if not check_uses_snmp(datatype): continue # no snmp check