Mikrotik widget : requested changes

This commit is contained in:
Benoit 2022-12-23 17:42:46 +01:00
parent f3ba97ec5f
commit fea26c00f9
4 changed files with 19 additions and 12 deletions

3
.gitignore vendored
View File

@ -42,6 +42,7 @@ next-env.d.ts
# homepage
/config
# IDEs
/.idea/
/config/

View File

@ -390,9 +390,9 @@
"no_devices": "No Device Data Received"
},
"mikrotik": {
"cpuload": "CPU Load",
"memoryused": "Memory Used",
"cpuLoad": "CPU Load",
"memoryUsed": "Memory Used",
"uptime": "Uptime",
"numberofleases": "Leases"
"numberOfLeases": "Leases"
}
}

View File

@ -21,23 +21,23 @@ export default function Component({ service }) {
return (
<Container service={service}>
<Block label="mikrotik.uptime" />
<Block label="mikrotik.cpuload" />
<Block label="mikrotik.memoryused" />
<Block label="mikrotik.numberofleases" />
<Block label="mikrotik.cpuLoad" />
<Block label="mikrotik.memoryUsed" />
<Block label="mikrotik.numberOfLeases" />
</Container>
);
}
const memoryused = 100 - (statsData['free-memory'] / statsData['total-memory'])*100
const memoryUsed = 100 - (statsData['free-memory'] / statsData['total-memory'])*100
const numberofleases = leasesData.length
const numberOfLeases = leasesData.length
return (
<Container service={service}>
<Block label="mikrotik.uptime" value={ statsData.uptime } />
<Block label="mikrotik.cpuload" value={t("common.percent", { value: statsData['cpu-load'] })} />
<Block label="mikrotik.memoryused" value={t("common.percent", { value: memoryused })} />
<Block label="mikrotik.numberofleases" value={t("common.number", { value: numberofleases })} />
<Block label="mikrotik.cpuLoad" value={t("common.percent", { value: statsData['cpu-load'] })} />
<Block label="mikrotik.memoryUsed" value={t("common.percent", { value: memoryUsed })} />
<Block label="mikrotik.numberOfLeases" value={t("common.number", { value: numberOfLeases })} />
</Container>
);
}

View File

@ -8,6 +8,12 @@ const widget = {
mappings: {
system: {
endpoint: "system/resource",
validate: [
"cpu-load",
"free-memory",
"total-memory",
"uptime"
]
},
leases: {
endpoint: "ip/dhcp-server/lease",