use only series for the vm instance name as counter instance name

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

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

@@ -3589,15 +3589,15 @@ protected Answer execute(GetVmDiskStatsCommand cmd) {
                                     } else if (value.getId().getCounterId() == diskWriteIOPerfCounterInfo.getKey()) {
                                         writeReq = avg;
                                     } else if (value.getId().getCounterId() == diskReadKbsPerfCounterInfo.getKey()) {
-                                        readBytes = avg;
+                                        readBytes = avg * 1024;
                                     } else if (value.getId().getCounterId() == diskWriteKbsPerfCounterInfo.getKey()) {
-                                        writeBytes = avg;
+                                        writeBytes = avg * 1024;
                                     }
                                 }
                             }
                         }
                     }
-                    diskStats.add(new VmDiskStatsEntry(vmName, VmwareHelper.getDiskDeviceFileName(disk), writeReq, readReq, 1024 * writeBytes, 1024 * readBytes));
+                    diskStats.add(new VmDiskStatsEntry(vmName, VmwareHelper.getDiskDeviceFileName(disk), writeReq, readReq, writeBytes, readBytes));
                 }
                 if (diskStats.size() > 0) {
                     vmStatsMap.put(vmName, diskStats);
@@ -6109,22 +6109,22 @@ private HashMap<String, VmStatsEntry> getVmStats(List<String> vmNames) throws Ex
 
                     final ArrayList<PerfMetricId> perfMetricsIds = new ArrayList<PerfMetricId>();
                     if (rxPerfCounterInfo != null) {
-                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(rxPerfCounterInfo, "*"));
+                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(rxPerfCounterInfo, name));
                     }
                     if (txPerfCounterInfo != null) {
-                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(txPerfCounterInfo, "*"));
+                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(txPerfCounterInfo, name));
                     }
                     if (diskReadIOPerfCounterInfo != null) {
-                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(diskReadIOPerfCounterInfo, "*"));
+                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(diskReadIOPerfCounterInfo, name));
                     }
                     if (diskWriteIOPerfCounterInfo != null) {
-                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(diskWriteIOPerfCounterInfo, "*"));
+                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(diskWriteIOPerfCounterInfo, name));
                     }
                     if (diskReadKbsPerfCounterInfo != null) {
-                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(diskReadKbsPerfCounterInfo, "*"));
+                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(diskReadKbsPerfCounterInfo, name));
                     }
                     if (diskWriteKbsPerfCounterInfo != null) {
-                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(diskWriteKbsPerfCounterInfo, "*"));
+                        perfMetricsIds.add(VmwareHelper.createPerfMetricId(diskWriteKbsPerfCounterInfo, name));
                     }
 
                     if (perfMetricsIds.size() > 0) {