From 65143d862b4e7a0ab95e58e734f1b2df04f85928 Mon Sep 17 00:00:00 2001
From: Benoit SERRA <oupsman@oupsman.fr>
Date: Mon, 26 Dec 2022 07:36:36 +0100
Subject: [PATCH 1/4] 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 (
     <Container service={service}>
       <Block label="opnsense.cpu" value={t("common.percent", { value: cpu.toFixed(2) })}  />
-      <Block label="opnsense.memory" value={memory} />
+      <Block label="opnsense.memory" value={t("common.percent", { value: memory })} />
       <Block label="opnsense.wanUpload" value={t("common.bytes", { value: wanUpload })} />
       <Block label="opnsense.wanDownload" value={t("common.bytes", { value: wanDownload })} />
 

From e2a812ee914000b824f1196c4b47d9c149b1aef6 Mon Sep 17 00:00:00 2001
From: Benoit SERRA <oupsman@oupsman.fr>
Date: Mon, 26 Dec 2022 08:31:41 +0100
Subject: [PATCH 2/4] Update src/widgets/opnsense/component.jsx

Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>
---
 src/widgets/opnsense/component.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx
index d9e64929..c17a389f 100644
--- a/src/widgets/opnsense/component.jsx
+++ b/src/widgets/opnsense/component.jsx
@@ -29,8 +29,8 @@ export default function Component({ service }) {
   }
 
 
-  const cpuidle = activityData.headers[2].substring(60,64);
-  const cpu = 100 - parseFloat(cpuidle);
+  const cpuIdle = activityData.headers[2].match(/ ([0-9.]+)% idle/)[1];
+  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;

From 287cfddad2756d52d2c44c73ed5209695f850541 Mon Sep 17 00:00:00 2001
From: Benoit SERRA <oupsman@oupsman.fr>
Date: Mon, 26 Dec 2022 09:27:49 +0100
Subject: [PATCH 3/4] Update src/widgets/opnsense/component.jsx

Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>
---
 src/widgets/opnsense/component.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx
index c17a389f..f835ce09 100644
--- a/src/widgets/opnsense/component.jsx
+++ b/src/widgets/opnsense/component.jsx
@@ -31,9 +31,7 @@ export default function Component({ service }) {
 
   const cpuIdle = activityData.headers[2].match(/ ([0-9.]+)% idle/)[1];
   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 memory = activityData.headers[3].match(/Mem: (.+) Active,/)[1];
 
   const wanUpload = interfaceData.interfaces.wan['bytes transmitted'];
   const wanDownload = interfaceData.interfaces.wan['bytes received'];

From 36246127ff6ca7befb60864d086c311f74131d44 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 26 Dec 2022 00:29:51 -0800
Subject: [PATCH 4/4] Update src/widgets/opnsense/component.jsx

---
 src/widgets/opnsense/component.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widgets/opnsense/component.jsx b/src/widgets/opnsense/component.jsx
index f835ce09..53396b31 100644
--- a/src/widgets/opnsense/component.jsx
+++ b/src/widgets/opnsense/component.jsx
@@ -39,7 +39,7 @@ export default function Component({ service }) {
   return (
     <Container service={service}>
       <Block label="opnsense.cpu" value={t("common.percent", { value: cpu.toFixed(2) })}  />
-      <Block label="opnsense.memory" value={t("common.percent", { value: memory })} />
+      <Block label="opnsense.memory" value={memory} />
       <Block label="opnsense.wanUpload" value={t("common.bytes", { value: wanUpload })} />
       <Block label="opnsense.wanDownload" value={t("common.bytes", { value: wanDownload })} />