openstack
/
stackviz
Code Issues Proposed changes

Merge "Fix dstat graph processing"

This commit is contained in:
Zuul 2019-06-10 06:45:40 +00:00 committed by Gerrit Code Review
parent 7ac5fd9c31 9d4255e69e
commit 3f213493be
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/js/util/dstat-parse.js
View File

@ -38,7 +38,7 @@ var parseDstat = function(data, year) {
// assume UTC - may not necessarily be the case?
// dstat doesn't include the year in its logs, so we'll need to copy it
// from the subunit logs
var dateFormat = timeFormat.utcParse('%d-%m %H:%M:%S');
var dateFormat = timeFormat.utcParse('%Y-%d-%m %H:%M:%S');
var parsed = dsv.csvParseRows(data, function(row, i) {
if (i === 0) {
@ -47,13 +47,13 @@ var parseDstat = function(data, year) {
!row[0].endsWith('CSV output')) {
throw new Error('Invalid Dstat CSV');
}
} else if (i <= 4) { // header rows - ignore
} else if (i <= 3) { // header rows - ignore
return null;
} else if (i === 5) { // primary
} else if (i === 4) { // primary
primaryNames = row;
fillArrayRight(primaryNames);
return null;
} else if (i === 6) { // secondary
} else if (i === 5) { // secondary
secondaryNames = row;
names = mergeNames(primaryNames, secondaryNames);
@ -66,8 +66,7 @@ var parseDstat = function(data, year) {
var value = row[col];
if (value && name) {
if (name === 'system_time') {
value = dateFormat(value);
value.setFullYear(1900 + year);
value = dateFormat((1900 + year) + '-' + value);
} else {
value = parseFloat(value);
}