[checkmk-commits] Check_MK Git: check_mk: BI: change handling of PEND, max worst state

Module: check_mk Branch: master Commit: aefb0c79dc5c25e40cfe4d67c6cc79ca5cc378ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aefb0c79dc5c25… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 22 08:48:27 2011 +0100 BI: change handling of PEND, max worst state --- ChangeLog | 3 +++ web/htdocs/bi.py | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07b2bff..faa9409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ BI: * Added new component BI to Multisite. + * New third argument for worst and best: the worst possible + state (see docu) + * Make PENDING be slightly worst than OK WATO: * Allow moving hosts from one to another config file diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 7ae0952..c032fc3 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -746,11 +746,15 @@ def execute_inter_node(node, status_info): # /_/ \_\__, |\__, |_|(_) |_| \__,_|_| |_|\___|\__|_|\___/|_| |_|___/ # |___/ |___/ +# Function for sorting states. Pending should be slightly +# worst then OK. CRIT is worse than UNKNOWN. def state_weight(s): if s == CRIT: - return 10 + return 10.0 + elif s == PENDING: + return 0.5 else: - return s + return float(s) def x_best_state(l, x): ll = [ (state_weight(s), s) for s in l ] @@ -763,7 +767,7 @@ def x_best_state(l, x): return ll[n-1][1] -def aggr_nth_state(nodes, n): +def aggr_nth_state(nodes, n, worst_state): states = [] problems = [] for node in nodes: @@ -771,19 +775,19 @@ def aggr_nth_state(nodes, n): if node[0] != OK: problems.append(node[1]) state = x_best_state(states, n) - -# debug((states, n, state)) + if state_weight(state) > state_weight(worst_state): + state = worst_state # limit to worst state if len(problems) > 0: return state, "%d problems" % len(problems) else: return state, "" -def aggr_worst(nodes, n = 1): - return aggr_nth_state(nodes, -int(n)) +def aggr_worst(nodes, n = 1, worst_state = 3): + return aggr_nth_state(nodes, -int(n), int(worst_state)) -def aggr_best(nodes, n = 1): - return aggr_nth_state(nodes, int(n)) +def aggr_best(nodes, n = 1, worst_state = 3): + return aggr_nth_state(nodes, int(n), int(worst_state)) config.aggregation_functions["worst"] = aggr_worst config.aggregation_functions["best"] = aggr_best