Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

Combined graphs: remove now obsolete internal notes

by Mathias Kettner

Module: check_mk Branch: master Commit: ae9af58f6139661418f51c8c28bba02749d98ced URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae9af58f613966… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 2 14:51:52 2017 +0100 Combined graphs: remove now obsolete internal notes Change-Id: I6333095b7060771722a252903e797e415362e927 --- ZUTUN.graphing | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ZUTUN.graphing b/ZUTUN.graphing deleted file mode 100644 index c4e5aa0..0000000 --- a/ZUTUN.graphing +++ /dev/null @@ -1,6 +0,0 @@ -[2] Profilen und Performance verbessern - - -[6] lm: Graph zu Dashboard hinzufügen --> Das könnte Lars machen. Ich blick da - lm: nicht durch... -

7 years, 7 months

4441 mem: MemAvailable is now configurable

by Marcel Arentz

Module: check_mk Branch: master Commit: 717c3e2ec6513966ad142a4362c0a577bbac27cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=717c3e2ec65139… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Mar 2 13:48:02 2017 +0100 4441 mem: MemAvailable is now configurable Change-Id: I1b8562b4a0ff76bbee2d9914303a776d9994e3cf --- .werks/4441 | 10 ++++++++++ checks/mem | 22 +++++++++++++++------- web/plugins/wato/check_parameters.py | 1 + 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.werks/4441 b/.werks/4441 new file mode 100644 index 0000000..6b258a6 --- /dev/null +++ b/.werks/4441 @@ -0,0 +1,10 @@ +Title: mem: MemAvailable is now configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488458833 +Class: feature + + diff --git a/checks/mem b/checks/mem index 43a5ce2..ff996e1 100644 --- a/checks/mem +++ b/checks/mem @@ -148,13 +148,14 @@ factory_settings["mem_linux_default_levels"] = { - "levels_virtual": ("perc_used", ( 80.0, 90.0)), - "levels_total": ("perc_used", (120.0, 150.0)), - "levels_shm": ("perc_used", ( 20.0, 30.0)), - "levels_pagetables": ("perc_used", ( 8.0, 16.0)), - "levels_committed": ("perc_used", (100.0, 150.0)), - "levels_commitlimit": ("perc_free", ( 20.0, 10.0)), - "levels_vmalloc": ("abs_free", (50*1024*1024, 30*1024*1024)), + "levels_virtual" : ("perc_used", ( 80.0, 90.0)), + "levels_total" : ("perc_used", (120.0, 150.0)), + "levels_shm" : ("perc_used", ( 20.0, 30.0)), + "levels_pagetables" : ("perc_used", ( 8.0, 16.0)), + "levels_committed" : ("perc_used", (100.0, 150.0)), + "levels_commitlimit" : ("perc_free", ( 20.0, 10.0)), + "levels_available" : ("perc_free", ( 20.0, 10.0)), + "levels_vmalloc" : ("abs_free", (50*1024*1024, 30*1024*1024)), } def is_linux_meminfo(meminfo): @@ -319,6 +320,13 @@ def check_mem_linux(_no_item, params, info): if r[0]: yield r # only display if non-OK + # Available Memory + if "MemAvailable" in meminfo: + r = check_mem_levels("Available Memory", meminfo["MemAvailable"], + meminfo["TotalTotal"], params.get("levels_available"), of_what = "RAM") + if r[0]: + yield r # only display if non-OK + # VMalloc, # newer kernel version report wrong data, # i.d. both VmallocUsed and Chunk equal zero diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b6e27ed..9226201 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7342,6 +7342,7 @@ register_check_parameters( ( "levels_writeback", UpperMemoryLevels(_("Disk Writeback"))), ( "levels_committed", UpperMemoryLevels(_("Committed memory"), (100.0, 150.0), _("RAM + Swap"))), ( "levels_commitlimit", LowerMemoryLevels(_("Commit Limit"), ( 20.0, 10.0), _("RAM + Swap"))), + ( "levels_available", LowerMemoryLevels(_("Available memory"), ( 20.0, 10.0), _("RAM"))), ( "levels_vmalloc", LowerMemoryLevels(_("Largest Free VMalloc Chunk"))), ( "handle_hw_corrupted_error", MonitoringState( title = _("Handle Hardware Corrupted Error"),

7 years, 7 months

Refactoring: rename "abstract graph" into "graph artwork"

by Mathias Kettner

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)

7 years, 7 months

Refactoring: rename "graph definition" into "graph recipe"

by Mathias Kettner

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 <mk(a)mathias-kettner.de> 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')

7 years, 7 months

Refactoring: convert graph_info from list to OrderedDict

by Mathias Kettner

Module: check_mk Branch: master Commit: 6ff9747fd4e5da3e82d4764c7fa6b4275560bb7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ff9747fd4e5da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 10:53:55 2017 +0100 Refactoring: convert graph_info from list to OrderedDict Change-Id: Ic115e8e9a676ea65597e719845d3473c86ae8b5e --- .../memcached/web/plugins/metrics/memcached.py | 139 ++-- web/htdocs/metrics.py | 5 +- web/plugins/metrics/check_mk.py | 708 ++++++++++----------- 3 files changed, 396 insertions(+), 456 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6ff9747fd4…

7 years, 7 months

First protypic version of partially functional combined graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: b9079eff5b8615ab6a3aba658851af10097a5a7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9079eff5b8615… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 14:49:33 2017 +0100 First protypic version of partially functional combined graphs Change-Id: If05fc12477611e6da9ab67b605e9cbf1f7d449be --- web/htdocs/config.py | 5 +++++ web/htdocs/metrics.py | 14 +++++++++++--- web/htdocs/views.py | 23 +++++++++++++++++------ web/plugins/metrics/check_mk.py | 6 +++--- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 3c3d631..67b8543 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -161,6 +161,11 @@ def reporting_available(): return False +def combined_graphs_available(): + # HIRN: Really detect + return True + + def hide_language(lang): return lang in hide_languages diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 7626e20..0d918a2 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -75,10 +75,17 @@ def load_plugins(force): load_web_plugins("metrics", globals()) loaded_with_language = current_language - fixup_unit_into() + fixup_graph_info() + fixup_unit_info() -def fixup_unit_into(): +def fixup_graph_info(): + # create back link from each graph to its id. + for graph_id, graph in graph_info.items(): + graph["id"] = graph_id + + +def fixup_unit_info(): # create back link from each unit to its id. for unit_id, unit in unit_info.items(): unit["id"] = unit_id @@ -920,7 +927,7 @@ def build_perfometer(perfometer, translated_metrics): # +----------------------------------------------------------------------+ # | Implementation of time graphs - basic code, not the rendering | # | Rendering of the graphs is done by PNP4Nagios, we just create PHP | -# | templates for PNP here. +# | templates for PNP here. | # '----------------------------------------------------------------------' def get_graph_templates(translated_metrics): @@ -1027,6 +1034,7 @@ def add_fake_metrics(translated_metrics, metric_names): def generic_graph_template(metric_name): return { + "id" : "METRIC_" + metric_name, "metrics" : [ ( metric_name, "area" ), ], diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 2be24b2..3569fc6 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1792,13 +1792,15 @@ def render_view(view, rows, datasource, group_painters, painters, can_display_checkboxes = layout.get('checkboxes', False) if show_buttons: - show_context_links(view, show_filters, + show_context_links(view, datasource, show_filters, # Take into account: permissions, display_options row_count > 0 and command_form, # Take into account: layout capabilities can_display_checkboxes and not view.get("force_checkboxes"), show_checkboxes, # Show link to availability - datasource["table"] in [ "hosts", "services" ] or "aggr" in datasource["infos"]) + datasource["table"] in [ "hosts", "services" ] or "aggr" in datasource["infos"], + # Show link to combined graphs + "service" in datasource["infos"]) # User errors in filters html.show_user_errors() @@ -2058,9 +2060,9 @@ def ajax_set_viewoption(): po.save_to_config() -def show_context_links(thisview, show_filters, +def show_context_links(thisview, datasource, show_filters, enable_commands, enable_checkboxes, show_checkboxes, - show_availability): + show_availability, show_combined_graphs): # html.begin_context_buttons() called automatically by html.context_button() # That way if no button is painted we avoid the empty container if display_options.enabled(display_options.B): @@ -2141,8 +2143,17 @@ def show_context_links(thisview, show_filters, (thisview["owner"], thisview["name"], backurl) html.context_button(_("Edit View"), url, "edit", id="edit", bestof=config.context_buttons_to_show) - if display_options.enabled(display_options.E) and show_availability: - html.context_button(_("Availability"), html.makeuri([("mode", "availability")]), "availability") + if display_options.enabled(display_options.E): + if show_availability: + html.context_button(_("Availability"), html.makeuri([("mode", "availability")]), "availability") + if show_combined_graphs and config.combined_graphs_available(): + html.context_button(_("Combined graphs"), + html.makeuri([ + ("single_infos", ",".join(thisview["single_infos"])), + ("datasource", thisview["datasource"]), + ], + filename="combined_graphs.py"), "pnp") + if display_options.enabled(display_options.B): execute_hooks('buttons-end') diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 95932c1..df895cb 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -6038,7 +6038,7 @@ graph_info["used_cpu_time"] = { } -graph_info["time_usage_by_phase"] = { +graph_info["cmk_cpu_time_by_phase"] = { "title" : _("Time usage by phase"), "metrics" : [ ( "user_time,children_user_time,+", "stack", _("CPU time in user space") ), @@ -6979,7 +6979,7 @@ graph_info["handled_requests"] = { "omit_zero_metrics" : True, } -graph_info["time_spent_for_various_page_types"] = { +graph_info["cmk_http_pagetimes"] = { "title" : _("Time spent for various page types"), "metrics" : [ ("secs_cmk_views", "stack"), @@ -6999,7 +6999,7 @@ graph_info["time_spent_for_various_page_types"] = { "omit_zero_metrics" : True, } -graph_info["bytes_sent"] = { +graph_info["cmk_http_traffic"] = { "title" : _("Bytes sent"), "metrics" : [ ("bytes_cmk_views", "stack"),

7 years, 7 months

Refactoring: rename "graph specification" into "graph identification"

by Mathias Kettner

Module: check_mk Branch: master Commit: 3b4f78aa68907e7426dd52c910e61719295ceda5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b4f78aa68907e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 11:45:45 2017 +0100 Refactoring: rename "graph specification" into "graph identification" Change-Id: I3282b87c86f9d2f2b4d6177b8cfef140791efd44 --- .bugs/2839 | 2 +- web/htdocs/dashboard.py | 12 ++++++------ web/htdocs/metrics.py | 22 +++++++++++----------- web/plugins/dashboard/dashlets.py | 8 ++++---- web/plugins/views/painters.py | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.bugs/2839 b/.bugs/2839 index 89cd083..c068800 100644 --- a/.bugs/2839 +++ b/.bugs/2839 @@ -61,7 +61,7 @@ details: show_timeranges) File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 1760, in render_graphs_from_specification_html - graph_recipes = create_graph_recipes_from_specification(graph_specification) + graph_recipes = create_graph_recipes_from_specification(graph_identification) File "/omd/sites/heute/share/check_mk/web/plugins/metrics/graphs.py", line 145, in create_graph_recipes_from_specification return func(spec_info) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index a6340cd..fc94229 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1298,21 +1298,21 @@ def popup_add_dashlet(dashboard_name, dashlet_type, context, params): return if dashlet_type == "pnpgraph": - # Context will always be None here, but the graph_specification (in params) + # Context will always be None here, but the graph_identification (in params) # will contain it. Transform the data to the format needed by the dashlets. # Example: # params = [ 'template', {'service_description': 'CPU load', 'site': 'mysite', # 'graph_index': 0, 'host_name': 'server123'}]) - graph_specification = params[1] + graph_identification = params[1] if params[0] == "template": context = { - "host" : graph_specification["host_name"] + "host" : graph_identification["host_name"] } - if graph_specification.get("service_description") != "_HOST_": - context["service"] = graph_specification["service_description"] + if graph_identification.get("service_description") != "_HOST_": + context["service"] = graph_identification["service_description"] params = { - "source" : graph_specification["graph_index"] + 1 + "source" : graph_identification["graph_index"] + 1 } elif params[0] == "custom": diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 2238cc1..c0f9fec 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1427,7 +1427,7 @@ def page_graph_dashlet(): spec = html.var("spec") if not spec: raise MKUserError("spec", _("Missing spec parameter")) - graph_specification = json.loads(html.var("spec")) + graph_identification = json.loads(html.var("spec")) render = html.var("render") if not render: @@ -1435,14 +1435,14 @@ def page_graph_dashlet(): custom_graph_render_options = json.loads(html.var("render")) if cmk_graphs_possible(): - host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_options) - elif graph_specification[0] == "template": - host_service_graph_dashlet_pnp(graph_specification) + host_service_graph_dashlet_cmk(graph_identification, custom_graph_render_options) + elif graph_identification[0] == "template": + host_service_graph_dashlet_pnp(graph_identification) else: html.write(_("This graph can not be rendered.")) -def host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_options): +def host_service_graph_dashlet_cmk(graph_identification, custom_graph_render_options): size = (int(((float(html.var("width")) - 49 - 5)/html_size_per_ex)), int((float(html.var("height")) - 23)/html_size_per_ex)) @@ -1475,7 +1475,7 @@ def host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_opti graph_render_options) try: - graph_recipes = create_graph_recipes_from_specification(graph_specification) + graph_recipes = create_graph_recipes_from_specification(graph_identification) if graph_recipes: graph_recipe = graph_recipes[0] else: @@ -1495,12 +1495,12 @@ def host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_opti html.write(html_code) -def host_service_graph_dashlet_pnp(graph_specification): - site = graph_specification[1]["site"] - source = int(graph_specification[1]["graph_index"]) +def host_service_graph_dashlet_pnp(graph_identification): + site = graph_identification[1]["site"] + source = int(graph_identification[1]["graph_index"]) - pnp_host = pnp_cleanup(graph_specification[1]["host_name"]) - pnp_svc = pnp_cleanup(graph_specification[1]["service_description"]) + pnp_host = pnp_cleanup(graph_identification[1]["host_name"]) + pnp_svc = pnp_cleanup(graph_identification[1]["service_description"]) url_prefix = config.site(site)["url_prefix"] html.write(url_prefix + "pnp4nagios/index.php/image?host=%s&srv=%s&source=%d&view=%s&theme=multisite" % \ diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index b7ccf58..7596004 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -389,7 +389,7 @@ def dashlet_graph_reload_js(nr, dashlet): # configured. So we assume the default timerange here by default. timerange = dashlet.get('timerange', '1') - graph_specification = ("template", { + graph_identification = ("template", { "site" : site, "host_name" : host, "service_description" : service, @@ -401,7 +401,7 @@ def dashlet_graph_reload_js(nr, dashlet): } return "dashboard_render_graph(%d, %s, %s, '%s')" % \ - (nr, json.dumps(graph_specification), json.dumps(graph_render_options), timerange) + (nr, json.dumps(graph_identification), json.dumps(graph_render_options), timerange) dashlet_types["pnpgraph"] = { @@ -466,14 +466,14 @@ dashlet_types["pnpgraph"] = { "on_refresh" : dashlet_graph_reload_js, "script": """ var dashlet_offsets = {}; -function dashboard_render_graph(nr, graph_specification, graph_render_options, timerange) +function dashboard_render_graph(nr, graph_identification, graph_render_options, timerange) { // Get the target size for the graph from the inner dashlet container var inner = document.getElementById('dashlet_inner_' + nr); var c_w = inner.clientWidth; var c_h = inner.clientHeight; - var post_data = "spec=" + encodeURIComponent(JSON.stringify(graph_specification)) + var post_data = "spec=" + encodeURIComponent(JSON.stringify(graph_identification)) + "&render=" + encodeURIComponent(JSON.stringify(graph_render_options)) + "&timerange=" + encodeURIComponent(timerange) + "&width=" + c_w diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 2fb1f19..9da2f14 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -987,7 +987,7 @@ def time_graph_params(): def paint_time_graph_cmk(row, cell, show_timeranges=False): - graph_specification = ( + graph_identification = ( "template", { "site" : row["site"], "host_name" : row["host_name"], @@ -1023,7 +1023,7 @@ def paint_time_graph_cmk(row, cell, show_timeranges=False): "Maybe performance data processing is disabled.") return "", metrics.render_graphs_from_specification_html( - graph_specification, + graph_identification, graph_data_range, graph_render_options, show_timeranges)

7 years, 7 months

Combined graphs: update internal notes

by Mathias Kettner

Module: check_mk Branch: master Commit: 8d7a1373152e8f15edfd5c7995b1efc171aa349e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d7a1373152e8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 24 10:32:58 2017 +0100 Combined graphs: update internal notes Change-Id: Ie5e5bf9fb3f90c39ea0fb2461c0312bbb6f44fde --- ZUTUN.graphing | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ZUTUN.graphing b/ZUTUN.graphing index 2895fe2..132c293 100644 --- a/ZUTUN.graphing +++ b/ZUTUN.graphing @@ -6,14 +6,6 @@ [4] Titel der Graphen selbst -[5] au: Titel der einzelnen Metriken. Hierbei berücksichtigen, - au: ob alle Kurven vom gleichen Host oder Service kommen. - au: Frage klären, ob eventuell sogar der Name der Metrik - au: auch weggealssen wird - z.B. wenn der Graph nur eine - au: einzige Metrik zeigt und diese schon im Graph-Titel - au: zu sehen ist. - - [6] Graph zu Dashboard hinzufügen.

7 years, 7 months

Combined graph: useful color palette for lines representation

by Mathias Kettner

Module: check_mk Branch: master Commit: a3c0135a77630a34e58ff976165ce79d8016a458 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3c0135a77630a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 23 14:52:34 2017 +0100 Combined graph: useful color palette for lines representation Change-Id: Iabb4e093fcb3d961eb23179683be0ec4b10f1d21 --- ZUTUN.graphing | 32 ++++++++++++++++++-------------- web/htdocs/metrics.py | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 14 deletions(-) diff --git a/ZUTUN.graphing b/ZUTUN.graphing index edf4973..98851ef 100644 --- a/ZUTUN.graphing +++ b/ZUTUN.graphing @@ -5,14 +5,14 @@ zu machen. -[2] Farbabstufungen für "lines": - Hier einfach auf die Originalfarben ganz verzichten und - Palettenfarben verwenden. Dazu den Code angucken, wo wir - die Palatte definieren ("21/a", "22/a", ....). Daraus einen - Kreis bauen. Dann die Anzahl der Punkte im Kreis durch die - Anzahl der Kurven teilen und die Abstände dadurch so groß - wie möglich machen. Wenn wir mehr Kurven als Farben haben, - müssen wir mehrfach im Kreis "rumfahren". +[2] mk: Farbabstufungen für "lines": + mk: Hier einfach auf die Originalfarben ganz verzichten und + mk: Palettenfarben verwenden. Dazu den Code angucken, wo wir + mk: die Palatte definieren ("21/a", "22/a", ....). Daraus einen + mk: Kreis bauen. Dann die Anzahl der Punkte im Kreis durch die + mk: Anzahl der Kurven teilen und die Abstände dadurch so groß + mk: wie möglich machen. Wenn wir mehr Kurven als Farben haben, + mk: müssen wir mehrfach im Kreis "rumfahren". [3] au: Implementierung von "Average": einfach die kleine Funktion @@ -23,12 +23,12 @@ [4] Titel der Graphen selbst -[5] au:Titel der einzelnen Metriken. Hierbei berücksichtigen, - au:ob alle Kurven vom gleichen Host oder Service kommen. - au:Frage klären, ob eventuell sogar der Name der Metrik - au:auch weggealssen wird - z.B. wenn der Graph nur eine - au:einzige Metrik zeigt und diese schon im Graph-Titel - au:zu sehen ist. +[5] au: Titel der einzelnen Metriken. Hierbei berücksichtigen, + au: ob alle Kurven vom gleichen Host oder Service kommen. + au: Frage klären, ob eventuell sogar der Name der Metrik + au: auch weggealssen wird - z.B. wenn der Graph nur eine + au: einzige Metrik zeigt und diese schon im Graph-Titel + au: zu sehen ist. [6] Graph zu Dashboard hinzufügen. @@ -71,3 +71,7 @@ [18] Default festlegen, wenn man auf die Seite kommt. Sollen wir einfach "Summe" nehmen? + + +[19] Umswitchen der Darstellungsarten über die Knöpfe soll den gewählten Zeitbereich beibehalten. + Geht das überhaupt? diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 7986b53..37b04dd 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -220,6 +220,48 @@ def get_palette_color_by_index(i, shading='a'): return "%s/%s" % (color_key, shading) +# Return a list of colors that are as different as possible (visually) +# by distributing them on the HSV color wheel. +def get_n_different_colors(n): + total_weight = sum([x[1] for x in hsv_color_distribution]) + + colors = [] + while len(colors) < n: + weight_index = len(colors) * total_weight / n + hue = get_hue_by_weight_index(weight_index) + colors.append(hsv_to_hexrgb((hue, 1, 1))) + return colors + + +def get_hue_by_weight_index(weight_index): + section_begin = 0.0 + for section_end, section_weight in hsv_color_distribution: + if weight_index < section_weight: + section_size = section_end - section_begin + hue = section_begin + ((weight_index / section_weight) * section_size) + return hue + weight_index -= section_weight + section_begin = section_end + + + +# Try to distribute colors in a whay that the psychological +# colors distance is distributed evenly. +hsv_color_distribution = [ + (0.1, 10.0), # orange ... red + (0.2, 10.0), # orange ... yellow(-greenish) + (0.3, 5.0), # green-yellow + (0.4, 2.0), # green + (0.5, 5.0), # green .... cyan + (0.6, 20.0), # cyan ... seablue + (0.7, 10.0), # seablue ... dark blue + (0.8, 20.0), # dark blue ... violet + (0.9, 10.0), # violet .. magenta + (1.0, 20.0), # magenta .. red +] + + + def get_next_random_palette_color(): keys = cmk_color_palette.keys() if html.is_cached("random_color_index"): @@ -277,18 +319,21 @@ def render_color(color_rgb): int(color_rgb[1] * 255), int(color_rgb[2] * 255),) + # Make a color darker. v ranges from 0 (not darker) to 1 (black) def darken_color(rgb, v): def darken(x, v): return x * (1.0 - v) return tuple([ darken(x, v) for x in rgb ]) + # Make a color lighter. v ranges from 0 (not lighter) to 1 (white) def lighten_color(rgb, v): def lighten(x, v): return x + ((1.0 - x) * v) return tuple([ lighten(x, v) for x in rgb ]) + def mix_colors(a, b): return tuple([ (ca + cb) / 2.0 @@ -296,6 +341,7 @@ def mix_colors(a, b): in zip(a, b) ]) + def render_color_icon(color): return "<div class=color style=\"background-color: %s\"></div>" % color

7 years, 7 months

Combined graphs: updated internal notes

by Mathias Kettner

Module: check_mk Branch: master Commit: 17913be108f6baa97682cdcee063f8e388611942 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17913be108f6ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 27 14:55:32 2017 +0100 Combined graphs: updated internal notes Change-Id: Iefac836ba451812eb7403fdff8e12e9fb2c6866b --- ZUTUN.graphing | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ZUTUN.graphing b/ZUTUN.graphing index 7ced761..54c38c1 100644 --- a/ZUTUN.graphing +++ b/ZUTUN.graphing @@ -7,15 +7,17 @@ [8] Graph zu "GraphCollections" hinzufügen. -[9] Fall, dass ein Graph negative Metrik hat ("-line", "-area", "-stacked") +[9] au: Fall, dass ein Graph negative Metrik hat ("-line", "-area", "-stacked") -[10] Graphen mit mehreren Areas, saubere Stacks bilden. - Wenn die erste Metrik line oder area ist, nimmt man area, - sonst stacked. Beispiel zum Testen: Filesystem-Graph. Bei Sum kommt - aktuell nur die Hälfte raus wie bei Stacked - sollte aber ja das - gleiche Ergebnis zeigen. +[10] au: Graphen mit mehreren Areas, saubere Stacks bilden. + au: Wenn die erste Metrik line oder area ist, nimmt man area, + au: sonst stacked. Beispiel zum Testen: Filesystem-Graph. Bei Sum kommt + au: aktuell nur die Hälfte raus wie bei Stacked - sollte aber ja das + au: gleiche Ergebnis zeigen. au: Aktueller Status: Umgesetzt fuer "area" + au: Linie bei stacked: hier verwenden wir die Summe. Allerdings muss + au: man das auch in der Beschriftung der Linie dann korrekt machen. [12] Limit auf Menge der dargestellten Objekte. @@ -23,10 +25,6 @@ [14] Import views und visuals irgendwie aufrüamen -[16] Prüfung auf eine einheitliche Unit? Brauchen wir das? Im Originalcode ist - von den normalen Templates. - - [18] au: Default festlegen, wenn man auf die Seite kommt. Wenn die Variable "presentation" nicht da ist, soll er einfache "Summe" nehmen. Bei den Links von den Views dann "presentation" weglassen.

7 years, 7 months

← Newer
1
...
31
32
33
34
35
36
37
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017