From 65143d862b4e7a0ab95e58e734f1b2df04f85928 Mon Sep 17 00:00:00 2001 From: Benoit SERRA Date: Mon, 26 Dec 2022 07:36:36 +0100 Subject: [PATCH] Opnsense widget (#3) * OPNSense widget : initial version, memory usage is inaccurate. * OPNSense widget : code cleanup in widget.js. Firewall is no longer displayed, so it did not need to be queried. * OPNSense widget : fixing the CPU code to make it more reliable. * OPNSense widget : fixing the CPU code to make it more reliable. Removing uptime info --- src/widgets/opnsense/component.jsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx index 53396b31..d9e64929 100644 --- a/src/widgets/opnsense/component.jsx +++ b/src/widgets/opnsense/component.jsx @@ -29,9 +29,11 @@ export default function Component({ service }) { } - const cpuIdle = activityData.headers[2].match(/ ([0-9.]+)% idle/)[1]; - const cpu = 100 - parseFloat(cpuIdle); - const memory = activityData.headers[3].match(/Mem: (.+) Active,/)[1]; + const cpuidle = activityData.headers[2].substring(60,64); + const cpu = 100 - parseFloat(cpuidle); + const memoryInfos = activityData.headers[3].split(" "); + const totalMemory = parseFloat(memoryInfos[1]) + parseFloat(memoryInfos[3]) + parseFloat(memoryInfos[5]) + parseFloat(memoryInfos[7]) + parseFloat(memoryInfos[9])/1024 + parseFloat(memoryInfos[11]); + const memory = ( 1 - parseFloat(memoryInfos[11]) / totalMemory) * 100; const wanUpload = interfaceData.interfaces.wan['bytes transmitted']; const wanDownload = interfaceData.interfaces.wan['bytes received']; @@ -39,7 +41,7 @@ export default function Component({ service }) { return ( - +