From e52813b6262f5c4235de4e97c214608d2a96f62b Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Thu, 19 Sep 2024 22:16:00 +0100
Subject: [PATCH] Divide net and disk values by timer
---
emhttp/plugins/dynamix.vm.manager/nchan/vm_usage | 4 ++--
emhttp/plugins/dynamix/nchan/vm_dashusage | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage b/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
index ce62b8a93..887ec80c3 100755
--- a/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
+++ b/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
@@ -80,8 +80,8 @@ while (true) {
$echodata .= my_scale($vmdata['mem']*1024,$unit)."$unit / ".my_scale($vmdata['curmem']*1024,$unit)."$unit";
if ($vmdata['curmem'] === $vmdata['maxmem']) $echodata .= "
";
else $echodata .= " / " .my_scale($vmdata['maxmem']*1024,$unit)."$unit | ";
- $echodata .= _("Read").": ".my_scale($vmdata['rdrate'],$unit)."$unit/s "._("Write").": ".my_scale($vmdata['wrrate'],$unit)."$unit/s | ";
- $echodata .= _("RX").": ".my_scale($vmdata['rxrate'],$unit)."$unit/s "._("TX").": ".my_scale($vmdata['txrate'],$unit)."$unit/s | ";
+ $echodata .= _("Read").": ".my_scale($vmdata['rdrate']/$timer,$unit)."$unit/s
"._("Write").": ".my_scale($vmdata['wrrate']/$timer,$unit)."$unit/s";
+ $echodata .= _("RX").": ".my_scale($vmdata['rxrate']/$timer,$unit)."$unit/s "._("TX").": ".my_scale($vmdata['txrate']/$timer,$unit)."$unit/s | ";
}
$echo = $echodata ;
}
diff --git a/emhttp/plugins/dynamix/nchan/vm_dashusage b/emhttp/plugins/dynamix/nchan/vm_dashusage
index 3cdffef28..be0415b81 100755
--- a/emhttp/plugins/dynamix/nchan/vm_dashusage
+++ b/emhttp/plugins/dynamix/nchan/vm_dashusage
@@ -78,8 +78,8 @@ while (true) {
$echo[$vmencode ]['mem'] = "Mem: ".my_scale($vmdata['mem']*1024,$unit)."$unit / ".my_scale($vmdata['curmem']*1024,$unit)."$unit";
if ($vmdata['maxmem'] == $vmdata['curmem']) $echo[$vmencode ]['mem'] .="  ";
else $echo[$vmencode ]['mem'] .= " / ".my_scale($vmdata['maxmem']*1024,$unit)."$unit  ";
- $echo[$vmencode ]['disk'] = "Disk: "._("Rd").": ".my_scale($vmdata['rdrate'],$unit)."$unit/s "._("Wr").": ".my_scale($vmdata['wrrate'],$unit)."$unit/s  ";
- $echo[$vmencode ]['net'] = "Net: "._("RX").": ".my_scale($vmdata['rxrate'],$unit)."$unit/s "._("TX").": ".my_scale($vmdata['txrate'],$unit)."$unit/s  ";
+ $echo[$vmencode ]['disk'] = "Disk: "._("Rd").": ".my_scale($vmdata['rdrate']/$timer,$unit)."$unit/s "._("Wr").": ".my_scale($vmdata['wrrate']/$timer,$unit)."$unit/s  ";
+ $echo[$vmencode ]['net'] = "Net: "._("RX").": ".my_scale($vmdata['rxrate']/$timer,$unit)."$unit/s "._("TX").": ".my_scale($vmdata['txrate']/$timer,$unit)."$unit/s  ";
}
}