[checkmk-commits] Check_MK Git: check_mk: #2370 FIX Fix computation of "in downtime" and " acknownledged" of hosts in BI aggregations

Module: check_mk Branch: master Commit: a62008f4321006832e526386216ea202d0bbc56e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a62008f4321006… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 30 10:30:21 2015 +0200 #2370 FIX Fix computation of "in downtime" and "acknownledged" of hosts in BI aggregations BI automatically aggregates downtimes and acknowledgements. But for host nodes in a BI tree these two states had been swapped. This has been fixed. --- .werks/2370 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 6 +++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/2370 b/.werks/2370 new file mode 100644 index 0000000..7dc9060 --- /dev/null +++ b/.werks/2370 @@ -0,0 +1,11 @@ +Title: Fix computation of "in downtime" and "acknownledged" of hosts in BI aggregations +Level: 2 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435652878 + +BI automatically aggregates downtimes and acknowledgements. But for host nodes in a +BI tree these two states had been swapped. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 71eddaf..06d8cda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ BI: * 2369 FIX: Fix exception in BI availability via table "Hostname Aggregations" + * 2370 FIX: Fix computation of "in downtime" and "acknownledged" of hosts in BI aggregations... HW/SW-Inventory: * 2367 FIX: win_system: Fixed exception when non-UTF-8 sequences are contained agent output diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 5ad5398..4477107 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1913,8 +1913,8 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam row["state"], row["hard_state"], row["plugin_output"], - not not hostrow["acknowledged"], hostrow["scheduled_downtime_depth"] > 0, + not not hostrow["acknowledged"], hostrow["host_in_service_period"], row["services_with_fullstate"] ] if status_info == None: @@ -1925,8 +1925,8 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam hostrow["state"], hostrow["hard_state"], hostrow["plugin_output"], - not not hostrow["acknowledged"], hostrow["scheduled_downtime_depth"] > 0, + not not hostrow["acknowledged"], hostrow["host_in_service_period"], hostrow["services_with_fullstate"] ] } @@ -1945,8 +1945,8 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam this_row['state'], this_row['hard_state'], this_row['plugin_output'], - not not this_row["acknowledged"], this_row["scheduled_downtime_depth"] > 0, + not not this_row["acknowledged"], this_row["host_in_service_period"], this_row['services_with_fullstate'], ]