[checkmk-commits] Check_MK Git: check_mk: FIX: fix problem in win_dhcp_pools inventory

Module: check_mk Branch: master Commit: 1460bac9de778565f22a1f6a4c73a1ba622b2d05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1460bac9de7785… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Oct 15 16:30:45 2012 +0200 FIX: fix problem in win_dhcp_pools inventory --- ChangeLog | 4 +++- checks/win_dhcp_pools | 49 ++++++++++++++++++++++--------------------------- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 352ef6b..6254cb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,10 +60,12 @@ * Solaris agent: add <<<uptime>>> section (thanks to Daniel Roettgermann) * Added new WATO configurable option inventory_services_rules for the windows services inventory check - * Added new WATO configurable option inventory_processes_rules forr the + * Added new WATO configurable option inventory_processes_rules for the ps and ps.perf inventory * FIX: mssql_counters checks now really only inventorize percentage based counters if a base value is set + * win_dhcp_pools: do not inventorize empty pools any more. You can switch + back to old behaviour with win_dhcp_pools_inventorize_empty = True 1.2.0p3: Mulitisite diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index a956422..6334765 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -83,45 +83,40 @@ def parse_win_dhcp_pools(info): def inventory_win_dhcp_pools(info): inventory = [] - if win_dhcp_pools_inventorize_empty == True: - for line in parse_win_dhcp_pools(info): - if win_dhcp_pools_stats_translate.get(line[0], line[0]) == 'Subnet': - inventory.append((line[1], 'win_dhcp_pools_default_levels')) - return inventory - - inBlock = False + in_block = False last_pool = "" - poolStats = [] + pool_stats = [] for line in parse_win_dhcp_pools(info): if win_dhcp_pools_stats_translate.get(line[0], line[0]) == 'Subnet': - inBlock = True + in_block = True + pool_stats = [] last_pool = line[1] continue - if inBlock: - poolStats.append(saveint(line[1])) - if len(poolStats) == 3: - inBlock = False - used, free, pending = poolStats + if in_block: + pool_stats.append(saveint(line[1])) + if len(pool_stats) == 3: + in_block = False + used, free, pending = pool_stats size = used + free + pending - if size > 0: + if size > 0 or win_dhcp_pools_inventorize_empty: inventory.append((last_pool, 'win_dhcp_pools_default_levels')) return inventory def check_win_dhcp_pools(item, params, info): - inBlock = False - poolStats = [] + in_block = False + pool_stats = [] status = 0 for line in parse_win_dhcp_pools(info): if win_dhcp_pools_stats_translate.get(line[0], line[0]) == 'Subnet' and line[1] == item: - inBlock = True + in_block = True continue - if inBlock: - poolStats.append(saveint(line[1])) - if len(poolStats) == 3: + if in_block: + pool_stats.append(saveint(line[1])) + if len(pool_stats) == 3: break - if len(poolStats) == 3: - used, free, pending = poolStats + if len(pool_stats) == 3: + used, free, pending = pool_stats size = used + free + pending # Catch unused pools @@ -129,13 +124,13 @@ def check_win_dhcp_pools(item, params, info): return (3, "UNKNOWN - DHCP Pool contains no IP addresses / is deactivated") if free > 0: - percFree = 100 - size / free + perc_free = 100 - size / free else: - percFree = 0 + perc_free = 0 - if percFree < params[1]: + if perc_free < params[1]: status = 2 - elif percFree < params[0]: + elif perc_free < params[0]: status = 1 perfdata = [ ('free', free, params[0], params[1], 0, size),