[checkmk-commits] Check_MK Git: check_mk: Added option to win_dhcp_pool to prevent inventorization of empty pools

Module: check_mk Branch: master Commit: b7187a1738b9334b6314ec3bb99353a5bd21e59a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7187a1738b933… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 13:03:55 2012 +0200 Added option to win_dhcp_pool to prevent inventorization of empty pools --- checkman/win_dhcp_pools | 2 ++ checks/win_dhcp_pools | 24 +++++++++++++++++++++++- web/plugins/wato/check_mk_configuration.py | 10 ++++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/checkman/win_dhcp_pools b/checkman/win_dhcp_pools index a0f4e83..f040ac1 100644 --- a/checkman/win_dhcp_pools +++ b/checkman/win_dhcp_pools @@ -36,3 +36,5 @@ critical (int): Percentage of free leases to be left in the pool to issue a crit win_dhcp_pools_default_levels (float, float): The global default levels for all checks of this type. This is preset to {(10, 5)} (which means that the check gets critical if the pool has less than 5 percent of free leases left). +win_dhcp_pools_inventorize_empty (bool): Set to {True} if you want to inventorize + pools without any IP Address in it. diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index 1da4c77..d85a45e 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -61,6 +61,9 @@ # No. of pending offers = 0. win_dhcp_pools_default_levels = (10, 5) +win_dhcp_pools_inventorize_empty = False + +check_config_variables += [ "win_dhcp_pools_inventorize_empty"] win_dhcp_pools_stats_translate = { 'Entdeckungen': 'Discovers', @@ -82,9 +85,28 @@ 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 + last_pool = "" + poolStats = [] 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')) + inBlock = True + last_pool = line[1] + continue + if inBlock: + poolStats.append(saveint(line[1])) + if len(poolStats) == 3: + inBlock = False + used, free, pending = poolStats + size = used + free + pending + if size > 0: + inventory.append((last_pool, 'win_dhcp_pools_default_levels')) return inventory def check_win_dhcp_pools(item, params, info): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 09bda23..4cf93bf 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -563,6 +563,16 @@ register_configvar(group, ) register_configvar(group, + "win_dhcp_pools_inventorize_empty", + Checkbox( + title = _("Invetorize empty windows dhcp pools"), + help = _("You can activate the inventorization of " + "dhcp pools, which have no ip addresses in it"), + ), + need_restart = True + ) + +register_configvar(group, "printer_supply_some_remaining_status", DropdownChoice( title = _("Printer supply some ramaining status"),