From 1872cea76394eb4d100b79fca96d5ee6481a6146 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Thu, 13 Oct 2022 22:36:20 +0200
Subject: [PATCH] graphs: do not average cpu use

Show like htop/top: cpu core count * 100
---
 setup/start/collectd/collectd.conf | 4 ++--
 src/graphs.js                      | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/setup/start/collectd/collectd.conf b/setup/start/collectd/collectd.conf
index 1a091f721..708a09daa 100644
--- a/setup/start/collectd/collectd.conf
+++ b/setup/start/collectd/collectd.conf
@@ -187,9 +187,9 @@ LoadPlugin swap
 
        CalculateNum false
        CalculateSum true
-       CalculateAverage true
+       CalculateAverage false
        CalculateMinimum false
-       CalculateMaximum true
+       CalculateMaximum false
        CalculateStddev false
    </Aggregation>
 </Plugin>
diff --git a/src/graphs.js b/src/graphs.js
index cbe4642de..cb18d8cb4 100644
--- a/src/graphs.js
+++ b/src/graphs.js
@@ -9,6 +9,7 @@ const apps = require('./apps.js'),
     assert = require('assert'),
     BoxError = require('./boxerror.js'),
     docker = require('./docker.js'),
+    os = require('os'),
     safe = require('safetydance'),
     services = require('./services.js'),
     superagent = require('superagent');
@@ -103,5 +104,11 @@ async function getSystem(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
+    };
 }