From 55bcadedff4cba333b46bc9f5f849e914c1bb0bb Mon Sep 17 00:00:00 2001 From: hockwill Date: Sun, 21 Jul 2024 22:38:41 -0400 Subject: [PATCH 1/2] On branch BUG/1608_glances-network-error Changes to be committed: modified: src/components/Widgets/GlNetworkInterfaces.vue modified: src/components/Widgets/GlNetworkTraffic.vue bug ref: https://github.com/Lissy93/dashy/issues/1608 v4api ref: https://glances.readthedocs.io/en/latest/api.html#get-network v3api ref: https://github.com/nicolargo/glances/blob/support/glancesv3/docs/api.rst#get-network --- src/components/Widgets/GlNetworkInterfaces.vue | 10 +++++----- src/components/Widgets/GlNetworkTraffic.vue | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Widgets/GlNetworkInterfaces.vue b/src/components/Widgets/GlNetworkInterfaces.vue index 69ecef24..4ed09c4d 100644 --- a/src/components/Widgets/GlNetworkInterfaces.vue +++ b/src/components/Widgets/GlNetworkInterfaces.vue @@ -68,11 +68,11 @@ export default { networks.push({ name: network.interface_name, speed: network.speed, - online: network.is_up ? 'up' : 'down', - currentDownload: network.rx, - currentUpload: network.tx, - totalDownload: network.cumulative_rx, - totalUpload: network.cumulative_tx, + online: network.speed ? 'up' : 'down', //v3 to v4 is_up no longer seems to be a default response field + currentDownload: netowkr.bytes_recv, + currentUpload: network.bytes_sent, + totalDownload: network.bytes_recv_gauge, + totalUpload: network.bytes_sent_gauge, changeDownload: this.previous && network.rx > this.previous[index].rx, changeUpload: this.previous && network.tx > this.previous[index].tx, }); diff --git a/src/components/Widgets/GlNetworkTraffic.vue b/src/components/Widgets/GlNetworkTraffic.vue index 7d9350e6..321b6c2a 100644 --- a/src/components/Widgets/GlNetworkTraffic.vue +++ b/src/components/Widgets/GlNetworkTraffic.vue @@ -33,8 +33,8 @@ export default { /* eslint-disable prefer-destructuring */ Object.keys(trafficData).forEach((keyName) => { let upOrDown = null; - if (keyName.includes('_tx')) upOrDown = 'up'; - else if (keyName.includes('_rx')) upOrDown = 'down'; + if (keyName.includes('_sent')) upOrDown = 'up'; + else if (keyName.includes('_recv')) upOrDown = 'down'; trafficData[keyName].forEach((dataPoint) => { const dataTime = this.getRoundedTime(dataPoint[0]); if (upOrDown === 'up') { From d2da68bc6c497cf21181ae7f028ac7319ed13327 Mon Sep 17 00:00:00 2001 From: hockwill Date: Sun, 21 Jul 2024 22:42:23 -0400 Subject: [PATCH 2/2] spelling of keyword --- src/components/Widgets/GlNetworkInterfaces.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Widgets/GlNetworkInterfaces.vue b/src/components/Widgets/GlNetworkInterfaces.vue index 4ed09c4d..3c990095 100644 --- a/src/components/Widgets/GlNetworkInterfaces.vue +++ b/src/components/Widgets/GlNetworkInterfaces.vue @@ -69,7 +69,7 @@ export default { name: network.interface_name, speed: network.speed, online: network.speed ? 'up' : 'down', //v3 to v4 is_up no longer seems to be a default response field - currentDownload: netowkr.bytes_recv, + currentDownload: network.bytes_recv, currentUpload: network.bytes_sent, totalDownload: network.bytes_recv_gauge, totalUpload: network.bytes_sent_gauge,