prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #720 from rjnagal/summary

Browse Source 
Sort process output initially by cpu usage.
This commit is contained in:
Victor Marmol 2015-05-20 13:39:32 -06:00
commit d6f63e6a6b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pages/static/containers_js.go
View File

@ -35,7 +35,7 @@ function humanizeMetric(num) {
} }
// Draw a table. // Draw a table.
function drawTable(seriesTitles, titleTypes, data, elementId, numPages) { function drawTable(seriesTitles, titleTypes, data, elementId, numPages, sortIndex) {
var dataTable = new google.visualization.DataTable(); var dataTable = new google.visualization.DataTable();
for (var i = 0; i < seriesTitles.length; i++) { for (var i = 0; i < seriesTitles.length; i++) {
dataTable.addColumn(titleTypes[i], seriesTitles[i]); dataTable.addColumn(titleTypes[i], seriesTitles[i]);
@ -55,6 +55,8 @@ function drawTable(seriesTitles, titleTypes, data, elementId, numPages) {
page: 'enable', page: 'enable',
pageSize: numPages, pageSize: numPages,
allowHtml: true, allowHtml: true,
sortColumn: sortIndex,
sortAscending: false,
cssClassNames: cssClassNames, cssClassNames: cssClassNames,
}; };
window.charts[elementId].draw(dataTable, opts); window.charts[elementId].draw(dataTable, opts);
@ -439,6 +441,7 @@ function drawImages(images) {
window.charts = {}; window.charts = {};
var titles = ["Repository", "Tags", "ID", "Virtual Size", "Creation Time"]; var titles = ["Repository", "Tags", "ID", "Virtual Size", "Creation Time"];
var titleTypes = ['string', 'string', 'string', 'number', 'number']; var titleTypes = ['string', 'string', 'string', 'number', 'number'];
var sortIndex = 0;
var data = []; var data = [];
for (var i = 0; i < images.length; i++) { for (var i = 0; i < images.length; i++) {
var elements = []; var elements = [];
@ -459,7 +462,7 @@ function drawImages(images) {
elements.push({v: images[i].created, f: d.toLocaleString()}); elements.push({v: images[i].created, f: d.toLocaleString()});
data.push(elements); data.push(elements);
} }
drawTable(titles, titleTypes, data, "docker-images", 30); drawTable(titles, titleTypes, data, "docker-images", 30, sortIndex);
} }
function drawProcesses(isRoot, rootDir, processInfo) { function drawProcesses(isRoot, rootDir, processInfo) {
@ -468,6 +471,7 @@ function drawProcesses(isRoot, rootDir, processInfo) {
} }
var titles = ["User", "PID", "PPID", "Start Time", "CPU %", "MEM %", "RSS", "Virtual Size", "Status", "Running Time", "Command"]; var titles = ["User", "PID", "PPID", "Start Time", "CPU %", "MEM %", "RSS", "Virtual Size", "Status", "Running Time", "Command"];
var titleTypes = ['string', 'number', 'number', 'string', 'number', 'number', 'number', 'number', 'string', 'string', 'string']; var titleTypes = ['string', 'number', 'number', 'string', 'number', 'number', 'number', 'number', 'string', 'string', 'string'];
var sortIndex = 4
if (isRoot) { if (isRoot) {
titles.push("Cgroup"); titles.push("Cgroup");
titleTypes.push('string'); titleTypes.push('string');
@ -494,7 +498,7 @@ function drawProcesses(isRoot, rootDir, processInfo) {
} }
data.push(elements); data.push(elements);
} }
drawTable(titles, titleTypes, data, "processes-top", 25); drawTable(titles, titleTypes, data, "processes-top", 25, sortIndex);
} }
// Draw the filesystem usage nodes. // Draw the filesystem usage nodes.