shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

feature #3718: Fix cpu and memory monitoring in vms table

Browse Source
This commit is contained in:
Daniel Molina 2015-07-07 16:41:51 +02:00
parent 692860393e
commit 71caf7ab4a
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
View File

@ -50,6 +50,18 @@ define(function(require) {
vncIcon = '';
}
var cpuMonitoring = 0;
var memoryMonitoring = 0;
if (element.MONITORING) {
if (element.MONITORING.CPU) {
cpuMonitoring = element.MONITORING.CPU
}
if (element.MONITORING.MEMORY) {
memoryMonitoring = element.MONITORING.MEMORY
}
}
return [
'<input class="check_item" type="checkbox" id="' + RESOURCE.toLowerCase() + '_' +
element.ID + '" name="selected_items" value="' +
@ -59,8 +71,8 @@ define(function(require) {
element.GNAME,
element.NAME,
state,
"TODO", //TODO new monitoring path for element.CPU,
Humanize.size(element.MEMORY),
cpuMonitoring,
Humanize.size(memoryMonitoring),
OpenNebulaVM.hostnameStr(element),
OpenNebulaVM.ipsStr(element),
Humanize.prettyTime(element.STIME),