[checkmk-commits] Check_MK Git: check_mk: #1720 FIX Remove bogus column H.Down if " Consider times where the host is down" is switch off

Module: check_mk Branch: master Commit: 019ac78ed318a4cd334a713937bf43219cb2f539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=019ac78ed318a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 22:30:07 2014 +0100 #1720 FIX Remove bogus column H.Down if "Consider times where the host is down" is switch off That column would be displayed nevertheless and was also zero. --- .werks/1720 | 9 +++++++++ ChangeLog | 3 +++ web/plugins/views/availability.py | 2 ++ 3 files changed, 14 insertions(+) diff --git a/.werks/1720 b/.werks/1720 new file mode 100644 index 0000000..463e8d4 --- /dev/null +++ b/.werks/1720 @@ -0,0 +1,9 @@ +Title: Remove bogus column H.Down if "Consider times where the host is down" is switch off +Level: 1 +Component: reporting +Compatible: compat +Version: 1.2.5i7 +Date: 1418074135 +Class: fix + +That column would be displayed nevertheless and was also zero. diff --git a/ChangeLog b/ChangeLog index 5ac7b22..e09711c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -250,6 +250,9 @@ * 1559 FIX: Fix link from BI icon to BI views (aggregations affected by this host/service) * 1692 FIX: Aggregations with umlauts in title/topic can now be displayed in BI/Availability + Reporting & Availability: + * 1720 FIX: Remove bogus column H.Down if "Consider times where the host is down" is switch off... + Event Console: * 1169 Added host state type filter to "recent event history" view * 1718 Show groups of regex match of events in details views of Event Console diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index af317a0..ffdbe04 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1300,6 +1300,8 @@ def render_availability_group(group_title, range_title, group_id, availability, return False elif sid == "flapping" and not avoptions["consider"]["flapping"]: return False + elif sid == "host_down" and not avoptions["consider"]["host_down"]: + return False elif sid in [ "warn", "unknown", "host_down" ] and sid not in state_groups: return False else: