Module: check_mk
Branch: master
Commit: 9d05bea391cc16e0b0316b2de5a61600f527c41e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d05bea391cc16…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jun 30 10:23:25 2015 +0200
#2369 FIX Fix exception in BI availability via table "Hostname Aggregations"
---
.werks/2369 | 9 +++++++++
ChangeLog | 3 +++
web/htdocs/bi.py | 7 +++++--
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/.werks/2369 b/.werks/2369
new file mode 100644
index 0000000..3e5fd5a
--- /dev/null
+++ b/.werks/2369
@@ -0,0 +1,9 @@
+Title: Fix exception in BI availability via table "Hostname Aggregations"
+Level: 2
+Component: bi
+Compatible: compat
+Version: 1.2.7i3
+Date: 1435652572
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index b53fbe5..86f1768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,9 @@
* 2348 FIX: HTML-Mails: Added missing link to service descriptions
* 2349 FIX: HTML-Mails: Fixed state colors in Outlook
+ BI:
+ * 2369 FIX: Fix exception in BI availability via table "Hostname
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 79784f5..5ad5398 100644
--- a/web/htdocs/bi.py
+++ b/web/htdocs/bi.py
@@ -1096,7 +1096,7 @@ def execute_leaf_node(node, status_info, use_hard_states):
"in_downtime" : host_in_downtime,
"acknowledged" : host_acknowledged,
"in_service_period" : host_in_service_period,
- }
+ }
if state_assumption != None:
assumed_state = {
"state" : state_assumption,
@@ -1104,7 +1104,7 @@ def execute_leaf_node(node, status_info, use_hard_states):
"in_downtime" : host_in_downtime,
"acknowledged" : host_acknowledged,
"in_service_period" : host_in_service_period,
- }
+ }
else:
assumed_state = None
return (state, assumed_state, node)
@@ -1915,6 +1915,7 @@ def singlehost_table(columns, add_headers, only_sites, limit,
filters, joinbynam
row["plugin_output"],
not not hostrow["acknowledged"],
hostrow["scheduled_downtime_depth"] > 0,
+ hostrow["host_in_service_period"],
row["services_with_fullstate"] ]
if status_info == None:
break
@@ -1926,6 +1927,7 @@ def singlehost_table(columns, add_headers, only_sites, limit,
filters, joinbynam
hostrow["plugin_output"],
not not hostrow["acknowledged"],
hostrow["scheduled_downtime_depth"] > 0,
+ hostrow["host_in_service_period"],
hostrow["services_with_fullstate"] ] }
for group, aggregation in aggrs:
@@ -1945,6 +1947,7 @@ def singlehost_table(columns, add_headers, only_sites, limit,
filters, joinbynam
this_row['plugin_output'],
not not this_row["acknowledged"],
this_row["scheduled_downtime_depth"] > 0,
+ this_row["host_in_service_period"],
this_row['services_with_fullstate'],
]