[checkmk-commits] Refactoring: rename "graph definition" into "graph recipe"

Module: check_mk Branch: master Commit: 77dd12a3f6817b5b5a314dce45ad79a8af2fdfdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77dd12a3f6817b… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Tue Feb 21 11:36:05 2017 +0100 Refactoring: rename "graph definition" into "graph recipe" Change-Id: I8cb2abd30255adaa15c9b42cb20de1ceceb71a29 --- .bugs/2814 | 2 +- .bugs/2839 | 10 +++++----- .werks/1073 | 2 +- .werks/2355 | 2 +- .werks/3465 | 2 +- tests/web/test_webapi.py | 2 +- web/htdocs/metrics.py | 16 ++++++++-------- web/plugins/metrics/check_mk.py | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bugs/2814 b/.bugs/2814 index b3ea6c0..af68f57 100644 --- a/.bugs/2814 +++ b/.bugs/2814 @@ -8,7 +8,7 @@ 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 - graph_artwork = compute_graph_artwork(graph_definition, graph_data_range, graph_render_options) + graph_artwork = compute_graph_artwork(graph_recipe, 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 diff --git a/.bugs/2839 b/.bugs/2839 index 962be8c..89cd083 100644 --- a/.bugs/2839 +++ b/.bugs/2839 @@ -61,15 +61,15 @@ details: show_timeranges) File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 1760, in render_graphs_from_specification_html - graph_definitions = create_graph_definitions_from_specification(graph_specification) + graph_recipes = create_graph_recipes_from_specification(graph_specification) - File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 145, in create_graph_definitions_from_specification + File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 145, in create_graph_recipes_from_specification return func(spec_info) - File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 189, in create_graph_definitions_from_template - graph_definition = create_graph_definition_from_template(graph_template, translated_metrics, site, host_name, service_description) + File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 189, in create_graph_recipes_from_template + graph_recipe = create_graph_recipe_from_template(graph_template, translated_metrics, site, host_name, service_description) - File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 211, in create_graph_definition_from_template + File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 211, in create_graph_recipe_from_template metric = parse_template_metric(site, host_name, service_description, metric_definition, translated_metrics) File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 283, in parse_template_metric diff --git a/.werks/1073 b/.werks/1073 index e57781e..7819926 100644 --- a/.werks/1073 +++ b/.werks/1073 @@ -1,4 +1,4 @@ -Title: sni_octopuse_cpu: added PNP graph definition and Perf-O-Meter +Title: sni_octopuse_cpu: added PNP graph template and Perf-O-Meter Level: 1 Component: checks Version: 1.2.5i5 diff --git a/.werks/2355 b/.werks/2355 index c79cfea..3a02867 100644 --- a/.werks/2355 +++ b/.werks/2355 @@ -1,4 +1,4 @@ -Title: docsis_channels_upstream: Fix graph definitions +Title: docsis_channels_upstream: Fix graph templates Level: 1 Component: checks Compatible: compat diff --git a/.werks/3465 b/.werks/3465 index 6381c7b..e7b881b 100644 --- a/.werks/3465 +++ b/.werks/3465 @@ -7,6 +7,6 @@ State: unknown Version: 1.4.0i1 Date: 1461597698 -The graph definition had an explicit vertical range of <tt>(0, 0)</tt>. That +The graph recipe had an explicit vertical range of <tt>(0, 0)</tt>. That effectively had set the displayed range to 0..1 Bytes/day - which led to an always empty or near useless graph. This has been fixed. diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index 06f5d6f..3ce73f0 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -188,7 +188,7 @@ def test_get_graph(web, site): # No graph yet... with pytest.raises(APIError) as e: data = web.get_regular_graph("test-host-get-graph", "Check_MK", 0, expect_error=True) - assert "Cannot calculate graph definitions" in "%s" % e + assert "Cannot calculate graph recipes" in "%s" % e # Now add the host web.add_host("test-host-get-graph", attributes={ diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 222e539..2238cc1 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -445,7 +445,7 @@ def translate_metrics(perf_data, check_command): new_entry = { "value" : value * translation_entry["scale"], "orig_name" : varname, - "scale" : translation_entry["scale"], # needed for graph definitions + "scale" : translation_entry["scale"], # needed for graph recipes "scalar" : {}, } @@ -1332,7 +1332,7 @@ def browser_supports_canvas(): return True -# CLEANUP: Make this function being used only by create_graph_definition_from_template. +# CLEANUP: Make this function being used only by create_graph_recipe_from_template. # Then rename it and move it over there. def get_graph_data_from_livestatus(site, host_name, service): if service == "_HOST_": @@ -1475,11 +1475,11 @@ def host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_opti graph_render_options) try: - graph_definitions = create_graph_definitions_from_specification(graph_specification) - if graph_definitions: - graph_definition = graph_definitions[0] + graph_recipes = create_graph_recipes_from_specification(graph_specification) + if graph_recipes: + graph_recipe = graph_recipes[0] else: - raise MKGeneralException(_("Failed to calculate a graph definition.")) + raise MKGeneralException(_("Failed to calculate a graph recipe.")) except MKLivestatusNotFoundError: html.write("<div class=error>%s</div>" % html.attrencode(_("Cannot render graphs: cannot fetch data via Livestatus"))) return @@ -1488,10 +1488,10 @@ def host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_opti # make the graph fit into the dashlet area. if graph_render_options["show_legend"]: # 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_artwork = compute_graph_artwork(graph_recipe, 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_code = render_graphs_from_definitions([graph_recipe], graph_data_range, graph_render_options) html.write(html_code) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 6bb7ac9..aac3c73 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5819,7 +5819,7 @@ perfometer_info.append({ # It determines the order of graphs of a service, which in turn is used by # the report definitions to determine which graph to include. -# Order of metrics in graph definitions important if you use only 'area': +# Order of metrics in graph recipes important if you use only 'area': # The first one must be the bigger one, then descending. # Example: ('tablespace_size', 'area'), # ('tablespace_used', 'area')