[checkmk-commits] Check_MK Git: check_mk: #1539 FIX Fixed refreshing of PNP graphs in dashboards

Module: check_mk Branch: master Commit: f436721a492879bf20819d43fc8fc06921ffcd5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f436721a492879… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 28 10:13:45 2014 +0100 #1539 FIX Fixed refreshing of PNP graphs in dashboards The PNP graphs contained in dashboards were not refreshed as intended. Now they are refreshed in the hard coded default interval of 60 seconds. This will be configurable soon. --- .werks/1539 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1539 b/.werks/1539 new file mode 100644 index 0000000..c0c6f26 --- /dev/null +++ b/.werks/1539 @@ -0,0 +1,12 @@ +Title: Fixed refreshing of PNP graphs in dashboards +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1417165950 + +The PNP graphs contained in dashboards were not refreshed as intended. +Now they are refreshed in the hard coded default interval of 60 seconds. +This will be configurable soon. diff --git a/ChangeLog b/ChangeLog index 7a864d2..7378e93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * 1553 FIX: Fix deleting (acknowleding) of logfiles in logwatch... * 1537 FIX: Added transformation code for user dashboards created between 2014-08 and 2014-10... * 1538 FIX: Only allow switching sites on/off when permitted to... + * 1539 FIX: Fixed refreshing of PNP graphs in dashboards... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 00127f5..aaf083f 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -376,8 +376,8 @@ def render_dashboard(name): # dashlets using static content (such as an iframe) will not be # refreshed by us but need to do that themselves. if "url" in dashlet or ('render' in dashlet_type and dashlet_type.get('refresh')): - url = dashlet.get("url", "dashboard_dashlet.py?name="+name+"&id="+ str(nr)); - refresh = dashlet.get("refresh") + url = dashlet.get("url", "dashboard_dashlet.py?name="+name+"&id="+ str(nr)) + refresh = dashlet.get("refresh", dashlet_type.get("refresh")) if refresh: # FIXME: remove add_wato_folder_to_url refresh_dashlets.append([nr, refresh, str(add_wato_folder_to_url(url, wato_folder))])