diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 37d27c855bc4..8c581f80a835 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -5934,7 +5934,7 @@ private HashMap getVmStats(List vmNames) throws Ex } else if (objProp.getName().contains(instanceNameCustomField)) { if (objProp.getVal() != null) vmInternalCSName = ((CustomFieldStringValue)objProp.getVal()).getValue(); - } else if (objProp.getName().equals(guestMemusage)) { + } else if (objProp.getName().equals(guestMemUseStr)) { guestMemusage = objProp.getVal().toString(); } else if (objProp.getName().equals(numCpuStr)) { numberCPUs = objProp.getVal().toString(); diff --git a/ui/scripts/metrics.js b/ui/scripts/metrics.js index 19d011815ce4..aa67b03ffe47 100644 --- a/ui/scripts/metrics.js +++ b/ui/scripts/metrics.js @@ -478,6 +478,9 @@ columns: { memorytotal: { label: 'label.metrics.allocated' + }, + memoryused: { + label: 'label.metrics.memory.used.avg' } } }, @@ -525,6 +528,12 @@ url: createURL('listVirtualMachinesMetrics'), data: data, success: function(json) { + json.listvirtualmachinesmetricsresponse.virtualmachine.forEach(function(vm) { + var memUsedPercent = (vm.memorykbs && vm.memoryintfreekbs) ? (Math.round((vm.memorykbs - vm.memoryintfreekbs) * 10000 / vm.memorykbs) / 100).toString() + "%" : ""; + $.extend(vm,{ + memoryused: memUsedPercent + }) + }); args.response.success({ data: json.listvirtualmachinesmetricsresponse.virtualmachine });