diff --git a/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page b/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page
index b87c75e57..9d82042ec 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page
@@ -19,7 +19,7 @@ Cond="exec(\"grep -o '^USAGE=.Y' /boot/config/domain.cfg 2>/dev/null\") && is_fi
$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
?>
- | _(Name)_ | _(Guest CPU)_ | _(Host CPU)_ | _(Memory)_ | _(Disk IO)_ | _(Network IO)_ |
+ | _(Name)_ | _(Guest CPU)_ | _(Host CPU)_ | _(Memory inuse/Current/Maximum)_ | _(Disk IO)_ | _(Network IO)_ |
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index d824f88be..5c86937b1 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -2661,8 +2661,8 @@ function get_vm_usage_stats($collectcpustats = true,$collectdiskstats = true,$co
# Memory Metrics
if ($state == 1 && $collectmemstats) {
$currentmem = $data["balloon.current"];
- $unusedmem = $data["balloon.unused"];
- $meminuse = $currentmem - $unusedmem;
+ $maximummem = $data["balloon.maximum"];
+ $meminuse = min($data["balloon.rss"],$data["balloon.current"]);
} else $currentmem = $meminuse = 0;
# Disk
@@ -2697,7 +2697,8 @@ function get_vm_usage_stats($collectcpustats = true,$collectdiskstats = true,$co
"cpuguest" => $cpuGuestPercent,
"timestamp" => $timestamp,
"mem" => $meminuse,
- "maxmem" => $currentmem,
+ "curmem" => $currentmem,
+ "maxmem" => $maximummem,
"rxrate" => $rxrate,
"rxp" => $rx,
"txrate" => $txrate,
diff --git a/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage b/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
index b0334dc54..bbb904089 100755
--- a/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
+++ b/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
@@ -77,7 +77,7 @@ while (true) {
$echodata .= "| $vm | " ;
$echodata .= "".$vmdata['cpuguest']."%
| ";
$echodata .= "".$vmdata['cpuhost']."%
| ";
- $echodata .= my_scale($vmdata['mem']*1024,$unit)."$unit / ".my_scale($vmdata['maxmem']*1024,$unit)."$unit | ";
+ $echodata .= my_scale($vmdata['mem']*1024,$unit)."$unit / ".my_scale($vmdata['curmem']*1024,$unit)."$unit /" .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 |
";
}
diff --git a/emhttp/plugins/dynamix/nchan/vm_dashusage b/emhttp/plugins/dynamix/nchan/vm_dashusage
index 9fcc0d227..7d7a1fea6 100755
--- a/emhttp/plugins/dynamix/nchan/vm_dashusage
+++ b/emhttp/plugins/dynamix/nchan/vm_dashusage
@@ -75,9 +75,9 @@ while (true) {
$vmencode = $lv->domain_get_uuid($vm);
$echo[$vmencode ]['gcpu'] = ""._("Guest CPU").": ".$vmdata['cpuguest']."%
";
$echo[$vmencode ]['hcpu'] = ""._("Host CPU").": ".$vmdata['cpuhost']."%
";
- $echo[$vmencode ]['mem'] = "Mem: ".my_scale($vmdata['mem']*1024,$unit)."$unit / ".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 ]['mem'] = "Mem: ".my_scale($vmdata['mem']*1024,$unit)."$unit / ".my_scale($vmdata['curmem']*1024,$unit)."$unit / ".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 ";
}
}