stats successfully transfered
This commit is contained in:
@@ -7,7 +7,8 @@
|
|||||||
"stylus": "~0.53.0",
|
"stylus": "~0.53.0",
|
||||||
"ejs": ">= 0.0.1",
|
"ejs": ">= 0.0.1",
|
||||||
"socket.io": "~1.4.4",
|
"socket.io": "~1.4.4",
|
||||||
"pty.js": "~0.3.0"
|
"pty.js": "~0.3.0",
|
||||||
|
"async": "~1.5.2"
|
||||||
},
|
},
|
||||||
"description": "Docker as a Service",
|
"description": "Docker as a Service",
|
||||||
"main": "servicedock.js",
|
"main": "servicedock.js",
|
||||||
|
@@ -646,6 +646,10 @@ function details(name) {
|
|||||||
showviz(docker.containers.subgraph(focused));
|
showviz(docker.containers.subgraph(focused));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function stats(data) {
|
||||||
|
console.log("->rcv stats")
|
||||||
|
}
|
||||||
|
|
||||||
function images(i) {
|
function images(i) {
|
||||||
console.log("->rcv images");
|
console.log("->rcv images");
|
||||||
docker.images.set(i);
|
docker.images.set(i);
|
||||||
@@ -781,7 +785,7 @@ function bash_data(data) {
|
|||||||
$("#screen").append('<span class="'+data.type+'">'+ansifilter(htmlenc(data.text))+'</span>');
|
$("#screen").append('<span class="'+data.type+'">'+ansifilter(htmlenc(data.text))+'</span>');
|
||||||
}
|
}
|
||||||
$("#screen").animate({
|
$("#screen").animate({
|
||||||
scrollTop: $("#screen").scrollHeight()
|
scrollTop: $("#screen").prop('scrollHeight')
|
||||||
}, 500);}
|
}, 500);}
|
||||||
|
|
||||||
function overview() {
|
function overview() {
|
||||||
@@ -814,6 +818,7 @@ function init() {
|
|||||||
.on("fail", error)
|
.on("fail", error)
|
||||||
.on("containers", containers)
|
.on("containers", containers)
|
||||||
.on("images", images)
|
.on("images", images)
|
||||||
|
.on("stats", stats)
|
||||||
.on("logs", logs)
|
.on("logs", logs)
|
||||||
.on("bash-data", bash_data);
|
.on("bash-data", bash_data);
|
||||||
start();
|
start();
|
||||||
|
@@ -9,38 +9,53 @@ module.exports = function() {
|
|||||||
var proc = require('child_process');
|
var proc = require('child_process');
|
||||||
|
|
||||||
function stats(ids) {
|
function stats(ids) {
|
||||||
var res = [];
|
var res = {};
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
|
var async = require('async');
|
||||||
var base = "/sys/fs/cgroup/";
|
var base = "/sys/fs/cgroup/";
|
||||||
var dataPoints = {
|
var dataPoints = {
|
||||||
"cpuacct": "stat",
|
"cpuacct": [
|
||||||
"memory": "usage_in_bytes",
|
"stat"
|
||||||
"memory": "max_usage_in_bytes"
|
],
|
||||||
|
"memory": [
|
||||||
|
"usage_in_bytes",
|
||||||
|
"max_usage_in_bytes"
|
||||||
|
]
|
||||||
};
|
};
|
||||||
ids.forEach(function(id) {
|
async.each(ids, function(id, cb1) {
|
||||||
res[id] = {};
|
res[id] = {};
|
||||||
for (key in dataPoints) {
|
async.forEachOf(dataPoints, function(val1, category, cb2) {
|
||||||
var file = base + key + '/docker/' + id + '/' + dataPoints[key];
|
res[id][category] = {};
|
||||||
res[id][key] = {};
|
async.each(val1, function(element, cb3) {
|
||||||
fs.readFile(file, 'utf8', function(err, data) {
|
var file = base + category + '/docker/' + id + '/' + category + '.' + element;
|
||||||
if (err) return;
|
res[id][category][element] = {};
|
||||||
data.trim().split('\n').forEach(function(v, i) {
|
fs.readFile(file, 'utf8', function(err, data) {
|
||||||
var vals = v.split(' ');
|
if (err) {cb3(err); return}
|
||||||
switch (vals.length) {
|
data.trim().split('\n').forEach(function(v, i) {
|
||||||
case 1:
|
var vals = v.split(' ');
|
||||||
res[id][dataPoints[key]] = parseInt(vals[0]);
|
switch (vals.length) {
|
||||||
break;
|
case 1:
|
||||||
case 2:
|
res[id][category][element] = vals[0];
|
||||||
res[id][key][dataPoints[key]] = {};
|
break;
|
||||||
res[id][key][dataPoints[key]][vals[0]] = parseInt(vals[1]);
|
case 2:
|
||||||
break;
|
res[id][category][element][vals[0]] = vals[1];
|
||||||
}
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
cb3();
|
||||||
});
|
});
|
||||||
|
}, function(err) {
|
||||||
|
cb2();
|
||||||
});
|
});
|
||||||
}
|
}, function(err) {
|
||||||
|
cb1();
|
||||||
|
});
|
||||||
|
}, function(err) {
|
||||||
|
if (err) return;
|
||||||
|
broadcast("stats", res);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("new client");
|
console.log("new client");
|
||||||
|
|
||||||
function emit(signal, data, info) {
|
function emit(signal, data, info) {
|
||||||
@@ -82,7 +97,6 @@ module.exports = function() {
|
|||||||
error: error, stderr: stderr, stdout: stdout
|
error: error, stderr: stderr, stdout: stdout
|
||||||
});
|
});
|
||||||
exec("docker inspect "+stdout.trim().replace(/\n/g, " "), containerinspect);
|
exec("docker inspect "+stdout.trim().replace(/\n/g, " "), containerinspect);
|
||||||
stats(stdout.trim().split('\n'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function updatecontainers(error, stdout, stderr) {
|
function updatecontainers(error, stdout, stderr) {
|
||||||
@@ -228,6 +242,13 @@ module.exports = function() {
|
|||||||
.on('bash-input', bash_input)
|
.on('bash-input', bash_input)
|
||||||
.on('bash-end', bash_end);
|
.on('bash-end', bash_end);
|
||||||
|
|
||||||
|
setInterval(function() {
|
||||||
|
exec("docker ps -q --no-trunc ", function(error, stdout, stderr) {
|
||||||
|
if (error || stderr) return; // ignore
|
||||||
|
stats(stdout.trim().split('\n'));
|
||||||
|
})
|
||||||
|
},
|
||||||
|
1000);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user