diff options
| author |   Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com> | 2019-04-26 16:08:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-04-26 16:08:59 +0000 |
| commit | 57b3199840cf80353052c2cfba60b40cade178bb (patch) | |
| tree | 2e988bcc81e1f97f52a62f2692d0659726c39548 /yardstick/common/nsb_report.js | |
| parent | d19ffbe2a974f9fb12cc783f4d20352739f7a227 (diff) | |
| parent | 34276b464ac7a2013d292680e545d25e515bb0cd (diff) | |
Merge changes from topic 'feat/baro_nfvi_metrics'
* changes:
Use baro and yardstick metrics in dynamic HTML report
benchmark.core.report: Add _combine_times
benchmark.core.report: Add _get_baro_metrics
Add ability to get data from different DBs in influx
Refactor: add _format_datasets
Diffstat (limited to 'yardstick/common/nsb_report.js')
| -rw-r--r-- | yardstick/common/nsb_report.js | 11 |
1 files changed, 8 insertions, 3 deletions
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], }); } }); |