Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes from topic 'feat/baro_nfvi_metrics'
[yardstick.git]
/
yardstick
/
common
/
nsb_report.js
diff --git
a/yardstick/common/nsb_report.js
b/yardstick/common/nsb_report.js
index
4de1c8e
..
1814190
100644
(file)
--- 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) 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
*
* 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,
borderWidth: 2,
fill: false,
tension: 0,
+ showline: true,
+ spanGaps: true,
},
},
scales: {
xAxes: [{
type: 'category',
},
},
scales: {
xAxes: [{
type: 'category',
+ display: true,
+ labels: timestamps,
+ autoSkip: true,
}],
yAxes: [{
type: 'linear',
}],
yAxes: [{
type: 'linear',
@@
-144,7
+149,7
@@
function update_graph(objGraph, datasets)
objGraph.update();
}
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 = [];
{
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,
selected_keys.push(node.id);
selected_datasets.push({
label: node.id,
- data:
table
_data[node.id],
+ data:
graph
_data[node.id],
});
}
});
});
}
});