diff --git a/public/language/en-GB/admin/development/info.json b/public/language/en-GB/admin/development/info.json index 0a4ae6fe2c..c095a9718b 100644 --- a/public/language/en-GB/admin/development/info.json +++ b/public/language/en-GB/admin/development/info.json @@ -7,7 +7,8 @@ "online": "online", "git": "git", "memory": "memory", - "load": "load", + "load": "system load", + "cpu-usage": "cpu usage", "uptime": "uptime", "registered": "Registered", diff --git a/src/controllers/admin/info.js b/src/controllers/admin/info.js index 92572840b9..31544ccdb4 100644 --- a/src/controllers/admin/info.js +++ b/src/controllers/admin/info.js @@ -65,6 +65,7 @@ function getNodeInfo(callback) { version: process.version, memoryUsage: process.memoryUsage(), uptime: process.uptime(), + cpuUsage: process.cpuUsage(), }, os: { hostname: os.hostname(), @@ -75,7 +76,8 @@ function getNodeInfo(callback) { load: os.loadavg().map(function (load) { return load.toFixed(2); }).join(', '), }, }; - + data.process.cpuUsage.user /= 1000; + data.process.cpuUsage.system /= 1000; data.process.memoryUsage.humanReadable = (data.process.memoryUsage.rss / (1024 * 1024)).toFixed(2); async.waterfall([ diff --git a/src/views/admin/development/info.tpl b/src/views/admin/development/info.tpl index d995233f17..08e8472f94 100644 --- a/src/views/admin/development/info.tpl +++ b/src/views/admin/development/info.tpl @@ -15,6 +15,7 @@