|
@@ -36,14 +36,24 @@ App.ChartClusterMetricsCPU = App.ChartLinearTimeView.extend({
|
|
isTimePagingDisable: true,
|
|
isTimePagingDisable: true,
|
|
transformToSeries: function (jsonData) {
|
|
transformToSeries: function (jsonData) {
|
|
var seriesArray = [];
|
|
var seriesArray = [];
|
|
|
|
+ var idle = null;
|
|
|
|
+
|
|
if (jsonData && jsonData.metrics && jsonData.metrics.cpu) {
|
|
if (jsonData && jsonData.metrics && jsonData.metrics.cpu) {
|
|
- for ( var name in jsonData.metrics.cpu) {
|
|
|
|
|
|
+ for (var name in jsonData.metrics.cpu) {
|
|
var seriesData = jsonData.metrics.cpu[name];
|
|
var seriesData = jsonData.metrics.cpu[name];
|
|
if (seriesData) {
|
|
if (seriesData) {
|
|
var s = this.transformData(seriesData, name);
|
|
var s = this.transformData(seriesData, name);
|
|
|
|
+ if (name === 'Idle') {
|
|
|
|
+ //CPU idle metric should be the last in series array
|
|
|
|
+ idle = s;
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
seriesArray.push(s);
|
|
seriesArray.push(s);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if (idle) {
|
|
|
|
+ seriesArray.push(idle);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return seriesArray;
|
|
return seriesArray;
|
|
},
|
|
},
|