[cloudstack] branch master updated: ui: add memory used column in instance metrics view (#3243)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 4e8f149  ui: add memory used column in instance metrics view (#3243)
4e8f149 is described below

commit 4e8f14975a3c1e6e2beec0a8e049e04b26f0930c
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Tue May 28 20:35:37 2019 +0530

    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.ya...@shapeblue.com>
---
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java     | 2 +-
 ui/scripts/metrics.js                                            | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

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 22b878c..abbe324 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
@@ -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();
diff --git a/ui/scripts/metrics.js b/ui/scripts/metrics.js
index 19d0118..aa67b03 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
                         });