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.html.j2 | |
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.html.j2')
-rw-r--r-- | yardstick/common/nsb_report.html.j2 | 7 |
1 files changed, 4 insertions, 3 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> |