diff options
author | Emma Foley <emma.l.foley@intel.com> | 2019-01-25 14:44:20 +0000 |
---|---|---|
committer | Myron Sosyak <myronx.sosyak@intel.com> | 2019-04-03 10:38:37 +0100 |
commit | 34276b464ac7a2013d292680e545d25e515bb0cd (patch) | |
tree | f7078cb7c153b2de9fc27c054c60fb5cb124317c /yardstick/common | |
parent | 6a0ab66ed2890c7236db8ff49cde909f24f5d92a (diff) |
Use baro and yardstick metrics in dynamic HTML report
_combine_metrics combines metrics from different sources.
This is for use with the ``yardstick report generate-nsb``
command, which will combine yardstick and barometer metrics
in the dynamic HTML report.
JIRA: YARDSTICK-1593
Change-Id: I87002948ebb4cc88fb0932380bcb9920eb53db58
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Diffstat (limited to 'yardstick/common')
-rw-r--r-- | yardstick/common/nsb_report.html.j2 | 7 | ||||
-rw-r--r-- | yardstick/common/nsb_report.js | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/yardstick/common/nsb_report.html.j2 b/yardstick/common/nsb_report.html.j2 index aa90253f8..a6713eb16 100644 --- a/yardstick/common/nsb_report.html.j2 +++ b/yardstick/common/nsb_report.html.j2 @@ -3,7 +3,7 @@ <!-- Copyright (c) 2017 Rajesh Kudaka <4k.rajesh@gmail.com> - Copyright (c) 2018 Intel Corporation. + Copyright (c) 2018-2019 Intel Corporation. All rights reserved. This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0 @@ -57,6 +57,7 @@ var report_time = {{report_time|safe}}; var report_keys = {{report_keys|safe}}; var report_tree = {{report_tree|safe}}; + var table_data = {{table_data|safe}}; // Wait for DOM to be loaded $(function() { @@ -64,10 +65,10 @@ var cnvGraph = $('#cnvGraph'); var divTree = $('#divTree'); - create_table(tblMetrics, report_data, report_time, report_keys); + create_table(tblMetrics, table_data, report_time, report_keys); var objGraph = create_graph(cnvGraph, report_time); create_tree(divTree, report_tree); - handle_tree(divTree, tblMetrics, objGraph, report_data, report_time); + handle_tree(divTree, tblMetrics, objGraph, report_data, table_data, report_time); }); </script> </body> diff --git a/yardstick/common/nsb_report.js b/yardstick/common/nsb_report.js index 4de1c8e78..18141900b 100644 --- a/yardstick/common/nsb_report.js +++ b/yardstick/common/nsb_report.js @@ -1,6 +1,6 @@ /******************************************************************************* * Copyright (c) 2017 Rajesh Kudaka <4k.rajesh@gmail.com> - * Copyright (c) 2018 Intel Corporation. + * Copyright (c) 2018-2019 Intel Corporation. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 @@ -72,11 +72,16 @@ function create_graph(cnvGraph, timestamps) borderWidth: 2, fill: false, tension: 0, + showline: true, + spanGaps: true, }, }, scales: { xAxes: [{ type: 'category', + display: true, + labels: timestamps, + autoSkip: true, }], yAxes: [{ type: 'linear', @@ -144,7 +149,7 @@ function update_graph(objGraph, datasets) objGraph.update(); } -function handle_tree(divTree, tblMetrics, objGraph, table_data, timestamps) +function handle_tree(divTree, tblMetrics, objGraph, graph_data, table_data, timestamps) { divTree.on('check_node.jstree uncheck_node.jstree', function(e, data) { var selected_keys = []; @@ -155,7 +160,7 @@ function handle_tree(divTree, tblMetrics, objGraph, table_data, timestamps) selected_keys.push(node.id); selected_datasets.push({ label: node.id, - data: table_data[node.id], + data: graph_data[node.id], }); } }); |