Module: check_mk
Branch: master
Commit: 9ece55eda82a354da7b5e39bf8d99de8a7b830dc
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ece55eda82a35…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Dec 2 17:17:27 2013 +0100
FIX Fixed summary computation in availability when grouping is used
In the availability view the summary line was computed wrong in cased
you had more than one group (e.g. by grouping after the service
group). That has been fixed.
---
.werks/15 | 11 +++++++++++
ChangeLog | 1 +
web/plugins/views/availability.py | 4 ++--
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.werks/15 b/.werks/15
new file mode 100644
index 0000000..9e70185
--- /dev/null
+++ b/.werks/15
@@ -0,0 +1,11 @@
+Title: Fixed summary computation in availability when grouping is used
+Level: 1
+Component: reporting
+Version: 1.2.3i7
+Date: 1386000955
+Class: fix
+
+In the availability view the summary line was computed wrong in cased
+you had more than one group (e.g. by grouping after the service
+group). That has been fixed.
+
diff --git a/ChangeLog b/ChangeLog
index 976b175..2c1ecd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -107,6 +107,7 @@
* 0056 New concept of service periods in availability reporting...
* 0002 You can now annotate events in the availability reporting...
* 0014 FIX: Fix styling of tables: always use complete width...
+ * 0015 FIX: Fixed summary computation in availability when grouping is used...
Event Console:
* 0026 FIX: snmptd_mkevent.py: fixed crash on startup
diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py
index 540deea..3e0b68c 100644
--- a/web/plugins/views/availability.py
+++ b/web/plugins/views/availability.py
@@ -1240,7 +1240,7 @@ def render_availability_group(group_title, range_title, group_id,
availability,
continue
number = summary.get(sid, 0)
if show_summary == "average" or
avoptions["timeformat"].startswith("percentage"):
- number /= len(availability)
+ number /= len(group_availability)
if avoptions["timeformat"].startswith("percentage"):
number *= considered_duration
if not number:
@@ -1256,7 +1256,7 @@ def render_availability_group(group_title, range_title, group_id,
availability,
if aggr == "cnt":
count = summary_counts.get(sid, 0)
if show_summary == "average":
- count = float(count) / len(availability)
+ count = float(count) / len(group_availability)
text = "%.2f" % count
else:
text = str(count)