Module: check_mk
Branch: master
Commit: b482d0c0899655d720cf0efd98ebd77fd0b54be6
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b482d0c0899655…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue May 10 14:45:53 2011 +0200
FIX: Avoid duplicate SNMP scan of checktypes containing a period
---
ChangeLog | 1 +
modules/check_mk.py | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e57bf8b..194d0db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
1.1.11i1:
Core, Setup, etc.:
+ * FIX: Avoid duplicate SNMP scan of checktypes containing a period
* 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
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 2bba92c..79ad2d2 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -1615,7 +1615,7 @@ def inventorable_checktypes(what): # tcp, all
checknames = [ k for k in check_info.keys()
if check_info[k][3] != no_inventory_possible
# and (k not in ignored_checktypes)
- and (what == "all" or k not in snmp_info)
+ and (what == "all" or k.split('.')[0] not in
snmp_info)
]
checknames.sort()
return checknames