This commit is contained in:
Charles
2022-04-05 19:41:09 +01:00
parent 5ef189b445
commit 6bec9f977f
3 changed files with 12 additions and 41 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "ucentral-client", "name": "ucentral-client",
"version": "2.6.12", "version": "2.6.13",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ucentral-client", "name": "ucentral-client",
"version": "2.6.12", "version": "2.6.13",
"dependencies": { "dependencies": {
"@coreui/coreui": "^3.4.0", "@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1", "@coreui/icons": "^2.0.1",

View File

@@ -1,6 +1,6 @@
{ {
"name": "ucentral-client", "name": "ucentral-client",
"version": "2.6.12", "version": "2.6.13",
"dependencies": { "dependencies": {
"@coreui/coreui": "^3.4.0", "@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1", "@coreui/icons": "^2.0.1",

View File

@@ -130,48 +130,19 @@ const StatisticsChartList = ({ setOptions, section, setStart, setEnd, time }) =>
// Looping through the interfaces of the log // Looping through the interfaces of the log
const version = log.data.version ?? 0; const version = log.data.version ?? 0;
for (const inter of log.data.interfaces) { for (const inter of log.data.interfaces) {
if (inter.ssids?.length > 0) {
let totalTx = 0;
let totalRx = 0;
for (const ssid of inter.ssids) {
if (ssid.associations) {
for (const assoc of ssid.associations) {
if (version === 0) {
if (assoc.deltas) {
totalTx += Math.max(0, assoc.deltas?.tx_bytes ?? 0);
totalRx += Math.max(0, assoc.deltas?.rx_bytes ?? 0);
} else {
totalTx += Math.max(0, assoc.tx_bytes ?? 0);
totalRx += Math.max(0, assoc.rx_bytes ?? 0);
}
} else {
totalTx += Math.max(0, assoc.tx_bytes ?? 0);
totalRx += Math.max(0, assoc.rx_bytes ?? 0);
}
}
}
}
if (version > 0) { if (version > 0) {
const tx = Math.floor(totalTx / 1024); const tx = inter.counters ? Math.floor(inter.counters.tx_bytes) : 0;
const rx = Math.floor(totalRx / 1024); const rx = inter.counters ? Math.floor(inter.counters.rx_bytes) : 0;
interfaceList[interfaceTypes[inter.name]][0].data.push(Math.max(0, tx - prevTx)); interfaceList[interfaceTypes[inter.name]][0].data.push(tx - prevTx);
interfaceList[interfaceTypes[inter.name]][1].data.push(Math.max(0, rx - prevRx)); interfaceList[interfaceTypes[inter.name]][1].data.push(rx - prevRx);
prevTx = tx; prevTx = tx;
prevRx = rx; prevRx = rx;
} else { } else {
interfaceList[interfaceTypes[inter.name]][0].data.push( interfaceList[interfaceTypes[inter.name]][0].data.push(
Math.max(0, Math.floor(totalTx / 1024)), inter.counters ? Math.floor(inter.counters.tx_bytes) : 0,
); );
interfaceList[interfaceTypes[inter.name]][1].data.push( interfaceList[interfaceTypes[inter.name]][1].data.push(
Math.max(0, Math.floor(totalRx / 1024)), inter.counters ? Math.floor(inter.counters.rx_bytes) : 0,
);
}
} else {
interfaceList[interfaceTypes[inter.name]][0].data.push(
inter.counters ? Math.max(0, Math.floor(inter.counters.tx_bytes)) : 0,
);
interfaceList[interfaceTypes[inter.name]][1].data.push(
inter.counters ? Math.max(0, Math.floor(inter.counters.rx_bytes)) : 0,
); );
} }
} }