From db4775387756ba7386757750a0970a7424e4abf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 28 Feb 2019 14:50:31 -0500
Subject: [PATCH] feat: add process cpu usage to admin

---
 public/language/en-GB/admin/development/info.json | 3 ++-
 src/controllers/admin/info.js                     | 4 +++-
 src/views/admin/development/info.tpl              | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

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 @@
 						<td>[[admin/development/info:nodejs]]</td>
 						<td>[[admin/development/info:online]]</td>
 						<td>[[admin/development/info:git]]</td>
+						<td>[[admin/development/info:cpu-usage]]</td>
 						<td>[[admin/development/info:memory]]</td>
 						<td>[[admin/development/info:load]]</td>
 						<td>[[admin/development/info:uptime]]</td>
@@ -32,6 +33,7 @@
 						<span title="[[admin/development/info:sockets]]">{info.stats.socketCount}</span>
 					</td>
 					<td>{info.git.branch}@<a href="https://github.com/NodeBB/NodeBB/commit/{info.git.hash}" target="_blank">{info.git.hash}</a></td>
+					<td>{info.process.cpuUsage.user} / {info.process.cpuUsage.system}</td>
 					<td>{info.process.memoryUsage.humanReadable} mb</td>
 					<td>{info.os.load}</td>
 					<td>{info.process.uptime}</td>