Module: check_mk Branch: master Commit: b6c2178fb05af355efa7c63fa311b0221367556e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c2178fb05af3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 18 14:56:57 2014 +0100 FIX availability: fixed exception on specific filter settings The generation of the availability data could raise an exception if the "Scheduled Downtimes" filter were set to "Exclude scheduled downtimes" --- .werks/558 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/558 b/.werks/558 new file mode 100644 index 0000000..bb71be3 --- /dev/null +++ b/.werks/558 @@ -0,0 +1,10 @@ +Title: availability: fixed exception on specific filter settings +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1392731502 + +The generation of the availability data could raise an exception +if the "Scheduled Downtimes" filter were set to "Exclude scheduled downtimes" diff --git a/ChangeLog b/ChangeLog index a189a00..9a3f495 100644 --- a/ChangeLog +++ b/ChangeLog @@ -223,6 +223,7 @@ * 0278 FIX: Fixed bookmark icon images for non-english user languages... * 0670 FIX: LDAP: Fixed sync when non lower case attributes are configured... * 0671 FIX: LDAP: Disable logging of password changes received from LDAP + * 0558 FIX: availability: fixed exception on specific filter settings... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 93d2590..eb57cdc 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -645,7 +645,7 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): (avoptions["downtimes"]["exclude_ok"] and state == 0) and not \ avoptions["downtimes"]["include"] == "ignore": if avoptions["downtimes"]["include"] == "exclude": - consider = false + consider = False else: s = "in_downtime" elif span["host_down"] and avoptions["consider"]["host_down"]: