4 Apr
2018
4 Apr
'18
1 a.m.
regression in 1.4.0p26)
Message-ID: <5ac469fa.7TSg3sAiyRQVYHho%lm(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.5 6/20/10
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: 41ecfc8110418ee07b0da1f0ae2b436c90700a8c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41ecfc8110418e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Apr 4 07:49:11 2018 +0200
5942 FIX Fixed broken BI availability with limit set to 0 (regression in 1.4.0p26)
In case you are affected, you can set the availability limit to another value than
0 to workaround this issue.
Change-Id: I7bf1ffa76f5b5b5197089cb11057378a9a940b51
---
.werks/5942 | 12 ++++++++++++
web/plugins/views/availability.py | 8 ++++----
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/.werks/5942 b/.werks/5942
new file mode 100644
index 0000000..3ea5cac
--- /dev/null
+++ b/.werks/5942
@@ -0,0 +1,12 @@
+Title: Fixed broken BI availability with limit set to 0 (regression in 1.4.0p26)
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i4
+Date: 1522820887
+
+In case you are affected, you can set the availability limit to another value than
+0 to workaround this issue.
diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py
index b10e229..adba2fd 100644
--- a/web/plugins/views/availability.py
+++ b/web/plugins/views/availability.py
@@ -542,10 +542,10 @@ def render_bi_availability(title, aggr_rows):
timewarp = None
has_reached_logrow_limit = False
- timeline_containers, fetched_rows =
availability.get_timeline_containers(aggr_rows,
-
avoptions,
-
timewarp,
-
livestatus_limit + 1)
+ timeline_containers, fetched_rows = availability.get_timeline_containers(
+ aggr_rows, avoptions, timewarp,
+ livestatus_limit + 1 if livestatus_limit != None else None
+ )
if livestatus_limit and fetched_rows > livestatus_limit:
has_reached_logrow_limit = True