mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-02 15:59:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

PHP Fixes and opentab for VM URL

Browse Source
This commit is contained in:
SimonFair
2024-06-27 20:17:05 +01:00
parent 20f34bc0b9
commit 3fdcbf125d
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+1 -1
View File
@@ -1636,7 +1636,7 @@
}
function get_domain_by_name($name) {
$tmp = libvirt_domain_lookup_by_name($this->conn, $name);
$tmp = @libvirt_domain_lookup_by_name($this->conn, $name);
return ($tmp) ? $tmp : $this->_set_last_error();
}
emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+1
View File
@@ -2616,6 +2616,7 @@ function get_vm_usage_stats($collectcpustats = true,$collectdiskstats = true,$co
$allstats=$lv->domain_get_all_domain_stats();
foreach ($allstats as $vm => $data) {
$rd=$wr=$tx=$rx=null;
$state = $data["state.state"];
# CPU Metrics
$cpuTime = 0;
emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
+1 -1
View File
@@ -3,7 +3,7 @@ function displayconsole(url) {
}
function displayWebUI(url) {
window.open(url, '', 'scrollbars=yes,resizable=yes');
window.open(url, '_blank').focus();
}
function downloadFile(source) {
emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
-2
View File
@@ -67,7 +67,6 @@ while (true) {
get_vm_usage_stats();
$echo = [];
$echo = [];
$ts = $time1 - $time0;
$echodata = "";
$running = 0;
ksort($vmusagestats);
@@ -90,7 +89,6 @@ while (true) {
$md5_new = md5($echo,true);
if ($md5_new !== $md5_old) {
$md5_old = publish('vm_usage',$echo)!==false ? $md5_new : -1;
$time0 = $time1;
}
sleep($timer);
emhttp/plugins/dynamix/nchan/vm_dashusage
+3 -3
View File
@@ -75,9 +75,9 @@ while (true) {
$vmencode = $lv->domain_get_uuid($vm);
$echo[$vmencode ]['gcpu'] = "<span class='advanced'>"._("Guest CPU").": <span class='cpug-".$vm."'>".$vmdata['cpuguest']."%</span><div class='usage-disk mm'><span id='cpug-".$vm."' style='width:".$vmdata['cpuguest']."%;'></span><span></span></div></span>";
$echo[$vmencode ]['hcpu'] = "<span class='advanced'>"._("Host CPU").": <span class='cpug-".$vm."'>".$vmdata['cpuhost']."%</span><div class='usage-disk mm'><span id='cpug-".$vm."' style='width:".$vmdata['cpuhost']."%;'></span><span></span></div></span>";
$echo[$vmencode ]['mem'] .= "<span>Mem: ".my_scale($vmdata['mem']*1024,$unit)."$unit / ".my_scale($vmdata['maxmem']*1024,$unit)."$unit</span>";
$echo[$vmencode ]['disk'] .= "<span>Disk: "._("Rd").": ".my_scale($vmdata['rdrate'],$unit)."$unit/s "._("Wr").": ".my_scale($vmdata['wrrate'],$unit)."$unit/s</span>";
$echo[$vmencode ]['net'] .= "<span>Net: "._("RX").": ".my_scale($vmdata['rxrate'],$unit)."$unit/s "._("TX").": ".my_scale($vmdata['txrate'],$unit)."$unit/s</span>";
$echo[$vmencode ]['mem'] = "<span>Mem: ".my_scale($vmdata['mem']*1024,$unit)."$unit / ".my_scale($vmdata['maxmem']*1024,$unit)."$unit</span>";
$echo[$vmencode ]['disk'] = "<span>Disk: "._("Rd").": ".my_scale($vmdata['rdrate'],$unit)."$unit/s "._("Wr").": ".my_scale($vmdata['wrrate'],$unit)."$unit/s</span>";
$echo[$vmencode ]['net'] = "<span>Net: "._("RX").": ".my_scale($vmdata['rxrate'],$unit)."$unit/s "._("TX").": ".my_scale($vmdata['txrate'],$unit)."$unit/s</span>";
}
}