Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'uditha-atukorala-devel' into devel

This commit is contained in:
hkernbach 2016-06-14 16:27:11 +02:00
parent 1be89d4667 498742ceb2
commit 30b4c8aca5
2 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/apps/system/_admin/aardvark/APP/frontend/js/config/dygraphConfig.js
View File

@ -46,7 +46,6 @@
}, },
mapStatToFigure : { mapStatToFigure : {
residentSize : ["times", "residentSizePercent"],
pageFaults : ["times", "majorPageFaultsPerSecond", "minorPageFaultsPerSecond"], pageFaults : ["times", "majorPageFaultsPerSecond", "minorPageFaultsPerSecond"],
systemUserTime : ["times", "systemTimePerSecond", "userTimePerSecond"], systemUserTime : ["times", "systemTimePerSecond", "userTimePerSecond"],
totalTime : ["times", "avgQueueTime", "avgRequestTime", "avgIoTime"], totalTime : ["times", "avgQueueTime", "avgRequestTime", "avgIoTime"],
@ -86,21 +85,6 @@
} }
}, },
residentSize: {
header: "Memory",
axes: {
y: {
labelsKMG2: false,
axisLabelFormatter: function (y) {
return parseFloat(y.toPrecision(3) * 100) + "%";
},
valueFormatter: function (y) {
return parseFloat(y.toPrecision(3) * 100) + "%";
}
}
}
},
pageFaults: { pageFaults: {
header : "Page Faults", header : "Page Faults",
visibility: [true, false], visibility: [true, false],

28
js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
View File

@ -205,17 +205,6 @@
}, 200); }, 200);
}, },
cleanupHistory: function(f) {
// clean up too big history data
if (this.history[this.server].hasOwnProperty(f)) {
if (this.history[this.server][f].length > this.defaultTimeFrame / this.interval) {
while (this.history[this.server][f].length > this.defaultTimeFrame / this.interval) {
this.history[this.server][f].shift();
}
}
}
},
updateCharts: function () { updateCharts: function () {
var self = this; var self = this;
@ -354,11 +343,6 @@
}); });
g.updateOptions(opts); g.updateOptions(opts);
//clean up history
if (this.history[this.server].hasOwnProperty(figure)) {
this.cleanupHistory(figure);
}
} }
$(window).trigger('resize'); $(window).trigger('resize');
this.resize(); this.resize();
@ -418,22 +402,20 @@
valueList = [valueList[0], read, write]; valueList = [valueList[0], read, write];
} }
self.history[self.server][f].push(valueList); self.history[self.server][f].unshift(valueList);
} }
}); });
}, },
cutOffHistory: function (f, cutoff) { cutOffHistory: function (f, cutoff) {
var self = this, v; var self = this, v, h = self.history[self.server][f];
while (self.history[self.server][f].length !== 0) { while (h.length !== 0) {
v = self.history[self.server][f][0][0]; if (h[h.length -1][0] >= cutoff) {
if (v >= cutoff) {
break; break;
} }
self.history[self.server][f].shift(); h.pop();
} }
}, },