0ct0pu5/homepage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #861 from benphelps/fix-opnsense-no-wan

Browse source 
Fix: Handle opnsense no wan interface
This commit is contained in:
shamoon 2023-01-22 14:29:49 -08:00 • committed by GitHub
commit d71a1f9345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/utils/config/service-helpers.js
View file

@ -214,7 +214,8 @@ export function cleanServiceGroups(groups) {
defaultinterval, defaultinterval,
namespace, // kubernetes widget namespace, // kubernetes widget
app, app,
podSelector podSelector,
wan // opnsense widget
} = cleanedService.widget; } = cleanedService.widget;
cleanedService.widget = { cleanedService.widget = {
@ -237,6 +238,9 @@ export function cleanServiceGroups(groups) {
if (app) cleanedService.widget.app = app; if (app) cleanedService.widget.app = app;
if (podSelector) cleanedService.widget.podSelector = podSelector; if (podSelector) cleanedService.widget.podSelector = podSelector;
} }
if (type === "opnsense") {
if (wan) cleanedService.widget.wan = wan;
}
} }
return cleanedService; return cleanedService;

8
src/widgets/opnsense/component.jsx
View file

@ -33,16 +33,14 @@ export default function Component({ service }) {
const cpu = 100 - parseFloat(cpuIdle); const cpu = 100 - parseFloat(cpuIdle);
const memory = activityData.headers[3].match(/Mem: (.+) Active,/)[1]; const memory = activityData.headers[3].match(/Mem: (.+) Active,/)[1];
const wanUpload = interfaceData.interfaces.wan['bytes transmitted']; const wan = widget.wan ? interfaceData.interfaces[widget.wan] : interfaceData.interfaces.wan;
const wanDownload = interfaceData.interfaces.wan['bytes received'];
return ( return (
<Container service={service}> <Container service={service}>
<Block label="opnsense.cpu" value={t("common.percent", { value: cpu.toFixed(2) })} /> <Block label="opnsense.cpu" value={t("common.percent", { value: cpu.toFixed(2) })} />
<Block label="opnsense.memory" value={memory} /> <Block label="opnsense.memory" value={memory} />
<Block label="opnsense.wanUpload" value={t("common.bytes", { value: wanUpload })} /> {wan && <Block label="opnsense.wanUpload" value={t("common.bytes", { value: wan['bytes transmitted'] })} />}
<Block label="opnsense.wanDownload" value={t("common.bytes", { value: wanDownload })} /> {wan && <Block label="opnsense.wanDownload" value={t("common.bytes", { value: wan['bytes received'] })} />}
</Container> </Container>
); );
} }