[checkmk-commits] Check_MK Git: check_mk: Added "view" parameter to dashlet_pnpgraph webservice

Module: check_mk Branch: master Commit: b7d42fd8baa99d6e9abbff950e852a2fcee04989 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7d42fd8baa99d… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Sep 24 14:38:05 2012 +0200 Added "view" parameter to dashlet_pnpgraph webservice --- .bugs/702 | 7 +++++-- ChangeLog | 4 ++++ web/htdocs/dashboard.py | 11 +++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.bugs/702 b/.bugs/702 index 1fcb715..212e042 100644 --- a/.bugs/702 +++ b/.bugs/702 @@ -1,8 +1,11 @@ Title: dashlet_pnpgraph is missing parameter "view" Component: multisite -State: open +Class: bug +State: done Date: 2012-07-27 10:26:30 Targetversion: 1.2.0 -Class: bug The view parameter is always set to 0. + +2012-09-24 14:37:03: changed state open -> done +Has just been implemented. diff --git a/ChangeLog b/ChangeLog index 129299c..c6a68c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.2.0p3 + Mulitisite + * Added "view" parameter to dashlet_pnpgraph webservice + 1.2.1i1: Core: * Allow to add options to rules. Currently the options "disabled" and diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c2076e0..bacb6a2 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -616,14 +616,17 @@ if (has_canvas_support()) { """ % { "x" : pie_diameter / 2, "y": pie_diameter/2, "d" : pie_diameter, 'p': '\n'.join(pie_parts) }) def dashlet_pnpgraph(): - render_pnpgraph(html.var("site"), html.var("host"), html.var("service"), int(html.var("source", 0))) + render_pnpgraph( + html.var("site"), html.var("host"), html.var("service"), + int(html.var("source", 0)), int(html.var("view", 0)), + ) def dashlet_nodata(): html.write("<div class=nograph><div class=msg>") html.write(html.var("message", _("No data available."))) html.write("</div></div>") -def render_pnpgraph(site, host, service=None, source=0): +def render_pnpgraph(site, host, service = None, source = 0, view = 0): if not host: html.message("Invalid URL to this dashlet. Missing <tt>host</tt>") return; @@ -635,8 +638,8 @@ def render_pnpgraph(site, host, service=None, source=0): else: base_url = html.site_status[site]["site"]["url_prefix"] base_url += "pnp4nagios/index.php/" - var_part = "?host=%s&srv=%s&view=0&source=%d&theme=multisite&_t=%d" % \ - (pnp_cleanup(host), pnp_cleanup(service), source, int(time.time())) + var_part = "?host=%s&srv=%s&view=0&source=%d&view=%d&theme=multisite&_t=%d" % \ + (pnp_cleanup(host), pnp_cleanup(service), source, view, int(time.time())) pnp_url = base_url + "graph" + var_part img_url = base_url + "image" + var_part