graphs: do not average cpu use
Show like htop/top: cpu core count * 100
This commit is contained in:
@@ -187,9 +187,9 @@ LoadPlugin swap
|
|||||||
|
|
||||||
CalculateNum false
|
CalculateNum false
|
||||||
CalculateSum true
|
CalculateSum true
|
||||||
CalculateAverage true
|
CalculateAverage false
|
||||||
CalculateMinimum false
|
CalculateMinimum false
|
||||||
CalculateMaximum true
|
CalculateMaximum false
|
||||||
CalculateStddev false
|
CalculateStddev false
|
||||||
</Aggregation>
|
</Aggregation>
|
||||||
</Plugin>
|
</Plugin>
|
||||||
|
|||||||
+8
-1
@@ -9,6 +9,7 @@ const apps = require('./apps.js'),
|
|||||||
assert = require('assert'),
|
assert = require('assert'),
|
||||||
BoxError = require('./boxerror.js'),
|
BoxError = require('./boxerror.js'),
|
||||||
docker = require('./docker.js'),
|
docker = require('./docker.js'),
|
||||||
|
os = require('os'),
|
||||||
safe = require('safetydance'),
|
safe = require('safetydance'),
|
||||||
services = require('./services.js'),
|
services = require('./services.js'),
|
||||||
superagent = require('superagent');
|
superagent = require('superagent');
|
||||||
@@ -103,5 +104,11 @@ async function getSystem(fromMinutes, noNullPoints) {
|
|||||||
serviceResponses[serviceId] = await getContainerStats(serviceId, fromMinutes, noNullPoints);
|
serviceResponses[serviceId] = await getContainerStats(serviceId, fromMinutes, noNullPoints);
|
||||||
}
|
}
|
||||||
|
|
||||||
return { cpu: memCpuResponse.body[0], memory: memCpuResponse.body[1], apps: appResponses, services: serviceResponses };
|
return {
|
||||||
|
cpu: memCpuResponse.body[0],
|
||||||
|
memory: memCpuResponse.body[1],
|
||||||
|
apps: appResponses,
|
||||||
|
services: serviceResponses,
|
||||||
|
cpuCount: os.cpus().length
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user