etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: add memory used column in instance metrics view (#3243) 

This adds memory used column in the instance metrics view. Also fixes
a bug for VMware, due to which incorrect memory usage was returned.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2019-05-28 20:35:37 +05:30 committed by GitHub
parent de18613206
commit 4e8f14975a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -5907,7 +5907,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
} 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();

9
ui/scripts/metrics.js
View File

@ -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
});