diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php index dac17f208..899dcdcb4 100644 --- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php +++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php @@ -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(); } diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php index f582e5243..7e8fd6dcc 100644 --- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php +++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php @@ -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; diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js index 07dad2bf2..d1ba5931d 100644 --- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -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) { diff --git a/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage b/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage index f5e3d6760..b0334dc54 100755 --- a/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage +++ b/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage @@ -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); diff --git a/emhttp/plugins/dynamix/nchan/vm_dashusage b/emhttp/plugins/dynamix/nchan/vm_dashusage index 02d3c56da..9fcc0d227 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['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"; } }