[checkmk-commits] Check_MK Git: check_mk: Remove non_bulkwalk_hosts

Module: check_mk Branch: master Commit: e8c6f78f1f0b5f8e03194140326ca5c56023672f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8c6f78f1f0b5f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 10:42:14 2010 +0100 Remove non_bulkwalk_hosts --- ChangeLog | 15 ++++++++++----- LIESMICH.zutun | 3 --- modules/check_mk.py | 3 --- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11fac0c..94a5064 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,13 @@ 1.1.9i1 + INCOMPATIBLE CHANGES: + * perfdata_format now defaults to "pnp". Previous default was "standard". + You might have to change that in main.mk if you are not using PNP (only + relevant for MRPE checks) + * inventory_check_severity defaults to 1 now (WARNING) + * aggregation_output_format now defaults to "multiline" + * Removed non_bulkwalk_hosts. You can use bulkwalk_hosts with NEGATE + instead (see docu) + Core, Setup, etc.: * Improve error handling: if hosts are monitored with SNMP *and* TCP, then after an error with one of those two agents checks from the @@ -10,11 +19,7 @@ * Inventory: Better error handling on invalid inventory result of checks * setup.sh: fix problem with missing package_info (only appears if setup is called from another directory) - * perfdata_format now defaults to "pnp". Previous default was "standard". - You might have to change that in main.mk if you are not using PNP (only - relevant for MRPE checks) - * inventory_check_severity defaults to 1 now (WARNING) - * aggregation_output_format now defaults to "multiline" + Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now diff --git a/LIESMICH.zutun b/LIESMICH.zutun index fa64229..3cd0b66 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -104,9 +104,6 @@ Abbruch, wenn immer noch type ist dict. Gleiches für bulkwalk_hosts [""] deprecaten, aus der Doku raus und durch ALL_SERVICES ersetzen -non_bulkwalk_hosts rausschmeissen. Kann man mit NEGATE nachbilden -mit bulkwalk_hosts. - IDEE: Scan-Modus: Wenn man einen Host per SNMP scannt und *keine* Antwort kommt, dann probiert man einfach alle SNMP-Checks aus. diff --git a/modules/check_mk.py b/modules/check_mk.py index ddd8628..4d07886 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -246,7 +246,6 @@ legacy_checks = [] all_hosts = [] snmp_hosts = [ (['snmp'], ALL_HOSTS) ] bulkwalk_hosts = None -non_bulkwalk_hosts = None usewalk_hosts = [] ignored_checktypes = [] # exclude from inventory ignored_services = [] # exclude from inventory @@ -611,8 +610,6 @@ def is_snmp_host(hostname): def is_bulkwalk_host(hostname): if bulkwalk_hosts: return in_binary_hostlist(hostname, bulkwalk_hosts) - elif non_bulkwalk_hosts: - return not in_binary_hostlist(hostname, non_bulkwalk_hosts) else: return False