Module: check_mk
Branch: master
Commit: a120592670a1ef7b9b34072e2d42e440aa720683
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a120592670a1ef…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Feb 21 11:29:34 2017 +0100
Refactoring: rename "abstract graph" into "graph artwork"
Change-Id: I04fcf2fb71ddc14b2113c924e903689548d0f9be
---
.bugs/2814 | 4 ++--
web/htdocs/metrics.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.bugs/2814 b/.bugs/2814
index 7aa9aa4..b3ea6c0 100644
--- a/.bugs/2814
+++ b/.bugs/2814
@@ -8,8 +8,8 @@ Targetversion: 1.2.8
2016-03-18 14:32:52 [3] [19625] Ajax call ajax_graph.py failed: list index out of range
Traceback (most recent call last):
File "/omd/sites/stable/share/check_mk/web/plugins/metrics/graphs.py", line
1659, in ajax_graph
- abstract_graph = compute_abstract_graph(graph_definition, graph_data_range,
graph_render_options)
- File "/omd/sites/stable/share/check_mk/web/plugins/metrics/graphs.py", line
407, in compute_abstract_graph
+ graph_artwork = compute_graph_artwork(graph_definition, graph_data_range,
graph_render_options)
+ File "/omd/sites/stable/share/check_mk/web/plugins/metrics/graphs.py", line
407, in compute_graph_artwork
elif chop_last_empty_step(graph_data_range, step, rrd_data):
File "/omd/sites/stable/share/check_mk/web/plugins/metrics/graphs.py", line
592, in chop_last_empty_step
if data[-1] != None:
diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py
index be5bc61..222e539 100644
--- a/web/htdocs/metrics.py
+++ b/web/htdocs/metrics.py
@@ -1487,9 +1487,9 @@ def host_service_graph_dashlet_cmk(graph_specification,
custom_graph_render_opti
# When the legend is enabled, we need to reduce the height by the height of the
legend to
# make the graph fit into the dashlet area.
if graph_render_options["show_legend"]:
- # TODO FIXME: This abstract graph is calulated twice. Once here and once in
render_graphs_from_specification_html()
- abstract_graph = compute_abstract_graph(graph_definition, graph_data_range,
graph_render_options)
- graph_render_options["size"] = (size[0], size[1] -
graph_legend_height_ex(graph_render_options, abstract_graph))
+ # TODO FIXME: This graph artwork is calulated twice. Once here and once in
render_graphs_from_specification_html()
+ graph_artwork = compute_graph_artwork(graph_definition, graph_data_range,
graph_render_options)
+ graph_render_options["size"] = (size[0], size[1] -
graph_legend_height_ex(graph_render_options, graph_artwork))
html_code = render_graphs_from_definitions([graph_definition], graph_data_range,
graph_render_options)
html.write(html_code)