Skip to content

Commit 028ca74

Browse files
shwstppryadvr
shwstppr
and
yadvr
authored
ui,server,api: resource metrics improvements (#6803)
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> Co-authored-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent eac357c commit 028ca74

40 files changed

Lines changed: 2291 additions & 938 deletions

File tree

‎api/src/main/java/org/apache/cloudstack/api/ApiConstants.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@ public class ApiConstants {
213213
public static final String ID = "id";
214214
public static final String IDS = "ids";
215215
public static final String INDEX = "index";
216+
public static final String INSTANCES_DISKS_STATS_RETENTION_ENABLED = "instancesdisksstatsretentionenabled";
217+
public static final String INSTANCES_DISKS_STATS_RETENTION_TIME = "instancesdisksstatsretentiontime";
218+
public static final String INSTANCES_STATS_RETENTION_TIME = "instancesstatsretentiontime";
219+
public static final String INSTANCES_STATS_USER_ONLY = "instancesstatsuseronly";
216220
public static final String PREFIX = "prefix";
217221
public static final String PREVIOUS_ACL_RULE_ID = "previousaclruleid";
218222
public static final String NEXT_ACL_RULE_ID = "nextaclruleid";
@@ -392,6 +396,7 @@ public class ApiConstants {
392396
public static final String START_IPV6 = "startipv6";
393397
public static final String START_PORT = "startport";
394398
public static final String STATE = "state";
399+
public static final String STATS = "stats";
395400
public static final String STATUS = "status";
396401
public static final String STORAGE_TYPE = "storagetype";
397402
public static final String STORAGE_POLICY = "storagepolicy";

‎api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Map;
2020

2121
import org.apache.cloudstack.api.APICommand;
22+
import org.apache.cloudstack.api.ApiConstants;
2223
import org.apache.cloudstack.api.BaseCmd;
2324
import org.apache.cloudstack.api.response.CapabilitiesResponse;
2425
import org.apache.cloudstack.config.ApiServiceConfiguration;
@@ -65,6 +66,10 @@ public void execute() {
6566
response.setApiLimitMax((Integer)capabilities.get("apiLimitMax"));
6667
}
6768
response.setDefaultUiPageSize((Long)capabilities.get(ApiServiceConfiguration.DefaultUIPageSize.key()));
69+
response.setInstancesStatsRetentionTime((Integer) capabilities.get(ApiConstants.INSTANCES_STATS_RETENTION_TIME));
70+
response.setInstancesStatsUserOnly((Boolean) capabilities.get(ApiConstants.INSTANCES_STATS_USER_ONLY));
71+
response.setInstancesDisksStatsRetentionEnabled((Boolean) capabilities.get(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_ENABLED));
72+
response.setInstancesDisksStatsRetentionTime((Integer) capabilities.get(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_TIME));
6873
response.setObjectName("capability");
6974
response.setResponseName(getCommandName());
7075
this.setResponseObject(response);

‎api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,22 @@ public class CapabilitiesResponse extends BaseResponse {
104104
@Param(description = "default page size in the UI for various views, value set in the configurations", since = "4.15.2")
105105
private Long defaultUiPageSize;
106106

107+
@SerializedName(ApiConstants.INSTANCES_STATS_RETENTION_TIME)
108+
@Param(description = "the retention time for Instances stats", since = "4.18.0")
109+
private Integer instancesStatsRetentionTime;
110+
111+
@SerializedName(ApiConstants.INSTANCES_STATS_USER_ONLY)
112+
@Param(description = "true if stats are collected only for user instances, false if system instance stats are also collected", since = "4.18.0")
113+
private Boolean instancesStatsUserOnly;
114+
115+
@SerializedName(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_ENABLED)
116+
@Param(description = "true if stats are retained for instance disks otherwise false", since = "4.18.0")
117+
private Boolean instancesDisksStatsRetentionEnabled;
118+
119+
@SerializedName(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_TIME)
120+
@Param(description = "the retention time for Instances disks stats", since = "4.18.0")
121+
private Integer instancesDisksStatsRetentionTime;
122+
107123
public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
108124
this.securityGroupsEnabled = securityGroupsEnabled;
109125
}
@@ -183,4 +199,20 @@ public void setKubernetesClusterExperimentalFeaturesEnabled(boolean kubernetesCl
183199
public void setDefaultUiPageSize(Long defaultUiPageSize) {
184200
this.defaultUiPageSize = defaultUiPageSize;
185201
}
202+
203+
public void setInstancesStatsRetentionTime(Integer instancesStatsRetentionTime) {
204+
this.instancesStatsRetentionTime = instancesStatsRetentionTime;
205+
}
206+
207+
public void setInstancesStatsUserOnly(Boolean instancesStatsUserOnly) {
208+
this.instancesStatsUserOnly = instancesStatsUserOnly;
209+
}
210+
211+
public void setInstancesDisksStatsRetentionEnabled(Boolean instancesDisksStatsRetentionEnabled) {
212+
this.instancesDisksStatsRetentionEnabled = instancesDisksStatsRetentionEnabled;
213+
}
214+
215+
public void setInstancesDisksStatsRetentionTime(Integer instancesDisksStatsRetentionTime) {
216+
this.instancesDisksStatsRetentionTime = instancesDisksStatsRetentionTime;
217+
}
186218
}

‎core/src/main/java/com/cloud/agent/api/VmDiskStatsEntry.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ public class VmDiskStatsEntry implements VmDiskStats {
3030
long bytesWrite = 0;
3131
long bytesRead = 0;
3232

33+
long deltaIoRead = 0;
34+
long deltaIoWrite = 0;
35+
long deltaBytesWrite = 0;
36+
long deltaBytesRead = 0;
37+
3338
public VmDiskStatsEntry() {
3439
}
3540

@@ -94,4 +99,36 @@ public long getIOWrite() {
9499
return ioWrite;
95100
}
96101

102+
public long getDeltaIoRead() {
103+
return deltaIoRead;
104+
}
105+
106+
public void setDeltaIoRead(long deltaIoRead) {
107+
this.deltaIoRead = deltaIoRead;
108+
}
109+
110+
public long getDeltaIoWrite() {
111+
return deltaIoWrite;
112+
}
113+
114+
public void setDeltaIoWrite(long deltaIoWrite) {
115+
this.deltaIoWrite = deltaIoWrite;
116+
}
117+
118+
public long getDeltaBytesWrite() {
119+
return deltaBytesWrite;
120+
}
121+
122+
public void setDeltaBytesWrite(long deltaBytesWrite) {
123+
this.deltaBytesWrite = deltaBytesWrite;
124+
}
125+
126+
public long getDeltaBytesRead() {
127+
return deltaBytesRead;
128+
}
129+
130+
public void setDeltaBytesRead(long deltaBytesRead) {
131+
this.deltaBytesRead = deltaBytesRead;
132+
}
133+
97134
}

‎core/src/main/java/com/cloud/agent/api/VmStatsEntry.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919

2020
package com.cloud.agent.api;
2121

22-
import com.cloud.vm.UserVmVO;
23-
2422
public class VmStatsEntry extends VmStatsEntryBase {
2523

26-
private UserVmVO userVmVO;
24+
private String vmUuid;
2725

2826
public VmStatsEntry() {
2927

@@ -52,12 +50,12 @@ public VmStatsEntry(long vmId, double memoryKBs, double intFreeMemoryKBs, double
5250
entityType);
5351
}
5452

55-
public UserVmVO getUserVmVO() {
56-
return userVmVO;
53+
public String getVmUuid() {
54+
return vmUuid;
5755
}
5856

59-
public void setUserVmVO(UserVmVO userVmVO) {
60-
this.userVmVO = userVmVO;
57+
public void setVmUuid(String vmUuid) {
58+
this.vmUuid = vmUuid;
6159
}
6260

6361
}

‎engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.cloud.vm;
1818

1919
import java.net.URI;
20+
import java.util.HashMap;
2021
import java.util.LinkedHashMap;
2122
import java.util.List;
2223
import java.util.Map;
@@ -263,4 +264,25 @@ static String getHypervisorHostname(String name) {
263264

264265
Pair<Long, Long> findClusterAndHostIdForVm(long vmId);
265266

267+
/**
268+
* Obtains statistics for a list of VMs; CPU and network utilization
269+
* @param hostId ID of the host
270+
* @param hostName name of the host
271+
* @param vmIds list of VM IDs
272+
* @return map of VM ID and stats entry for the VM
273+
*/
274+
HashMap<Long, ? extends VmStats> getVirtualMachineStatistics(long hostId, String hostName, List<Long> vmIds);
275+
/**
276+
* Obtains statistics for a list of VMs; CPU and network utilization
277+
* @param hostId ID of the host
278+
* @param hostName name of the host
279+
* @param vmMap map of VM IDs and the corresponding VirtualMachine object
280+
* @return map of VM ID and stats entry for the VM
281+
*/
282+
HashMap<Long, ? extends VmStats> getVirtualMachineStatistics(long hostId, String hostName, Map<Long, ? extends VirtualMachine> vmMap);
283+
284+
HashMap<Long, List<? extends VmDiskStats>> getVmDiskStatistics(long hostId, String hostName, Map<Long, ? extends VirtualMachine> vmMap);
285+
286+
HashMap<Long, List<? extends VmNetworkStats>> getVmNetworkStatistics(long hostId, String hostName, Map<Long, ? extends VirtualMachine> vmMap);
287+
266288
}

‎engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java‎

Lines changed: 106 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
package com.cloud.vm;
1919

20+
import static com.cloud.configuration.ConfigurationManagerImpl.MIGRATE_VM_ACROSS_CLUSTERS;
21+
2022
import java.net.URI;
2123
import java.sql.PreparedStatement;
2224
import java.sql.ResultSet;
@@ -45,7 +47,6 @@
4547
import javax.naming.ConfigurationException;
4648
import javax.persistence.EntityExistsException;
4749

48-
import com.cloud.storage.VolumeApiServiceImpl;
4950
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
5051
import org.apache.cloudstack.annotation.AnnotationService;
5152
import org.apache.cloudstack.annotation.dao.AnnotationDao;
@@ -98,6 +99,12 @@
9899
import com.cloud.agent.api.ClusterVMMetaDataSyncAnswer;
99100
import com.cloud.agent.api.ClusterVMMetaDataSyncCommand;
100101
import com.cloud.agent.api.Command;
102+
import com.cloud.agent.api.GetVmDiskStatsAnswer;
103+
import com.cloud.agent.api.GetVmDiskStatsCommand;
104+
import com.cloud.agent.api.GetVmNetworkStatsAnswer;
105+
import com.cloud.agent.api.GetVmNetworkStatsCommand;
106+
import com.cloud.agent.api.GetVmStatsAnswer;
107+
import com.cloud.agent.api.GetVmStatsCommand;
101108
import com.cloud.agent.api.MigrateCommand;
102109
import com.cloud.agent.api.MigrateVmToPoolAnswer;
103110
import com.cloud.agent.api.ModifyTargetsCommand;
@@ -122,6 +129,9 @@
122129
import com.cloud.agent.api.UnPlugNicAnswer;
123130
import com.cloud.agent.api.UnPlugNicCommand;
124131
import com.cloud.agent.api.UnregisterVMCommand;
132+
import com.cloud.agent.api.VmDiskStatsEntry;
133+
import com.cloud.agent.api.VmNetworkStatsEntry;
134+
import com.cloud.agent.api.VmStatsEntry;
125135
import com.cloud.agent.api.routing.NetworkElementCommand;
126136
import com.cloud.agent.api.to.DiskTO;
127137
import com.cloud.agent.api.to.DpdkTO;
@@ -208,6 +218,7 @@
208218
import com.cloud.storage.Volume;
209219
import com.cloud.storage.Volume.Type;
210220
import com.cloud.storage.VolumeApiService;
221+
import com.cloud.storage.VolumeApiServiceImpl;
211222
import com.cloud.storage.VolumeVO;
212223
import com.cloud.storage.dao.DiskOfferingDao;
213224
import com.cloud.storage.dao.GuestOSCategoryDao;
@@ -254,8 +265,6 @@
254265
import com.cloud.vm.snapshot.VMSnapshotVO;
255266
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
256267

257-
import static com.cloud.configuration.ConfigurationManagerImpl.MIGRATE_VM_ACROSS_CLUSTERS;
258-
259268
public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMachineManager, VmWorkJobHandler, Listener, Configurable {
260269
private static final Logger s_logger = Logger.getLogger(VirtualMachineManagerImpl.class);
261270

@@ -5825,4 +5834,98 @@ protected VMInstanceVO findVmById(Long vmId) {
58255834
assert vm != null;
58265835
return vm;
58275836
}
5837+
5838+
@Override
5839+
public HashMap<Long, ? extends VmStats> getVirtualMachineStatistics(long hostId, String hostName, List<Long> vmIds) {
5840+
HashMap<Long, VmStatsEntry> vmStatsById = new HashMap<>();
5841+
if (CollectionUtils.isEmpty(vmIds)) {
5842+
return vmStatsById;
5843+
}
5844+
Map<Long, VMInstanceVO> vmMap = new HashMap<>();
5845+
for (Long vmId : vmIds) {
5846+
vmMap.put(vmId, _vmDao.findById(vmId));
5847+
}
5848+
return getVirtualMachineStatistics(hostId, hostName, vmMap);
5849+
}
5850+
5851+
@Override
5852+
public HashMap<Long, ? extends VmStats> getVirtualMachineStatistics(long hostId, String hostName, Map<Long, ? extends VirtualMachine> vmMap) {
5853+
HashMap<Long, VmStatsEntry> vmStatsById = new HashMap<>();
5854+
if (MapUtils.isEmpty(vmMap)) {
5855+
return vmStatsById;
5856+
}
5857+
Map<String, Long> vmNames = new HashMap<>();
5858+
for (Map.Entry<Long, ? extends VirtualMachine> vmEntry : vmMap.entrySet()) {
5859+
vmNames.put(vmEntry.getValue().getInstanceName(), vmEntry.getKey());
5860+
}
5861+
Answer answer = _agentMgr.easySend(hostId, new GetVmStatsCommand(new ArrayList<>(vmNames.keySet()), _hostDao.findById(hostId).getGuid(), hostName));
5862+
if (answer == null || !answer.getResult()) {
5863+
s_logger.warn("Unable to obtain VM statistics.");
5864+
return vmStatsById;
5865+
} else {
5866+
HashMap<String, VmStatsEntry> vmStatsByName = ((GetVmStatsAnswer)answer).getVmStatsMap();
5867+
if (vmStatsByName == null) {
5868+
s_logger.warn("Unable to obtain VM statistics.");
5869+
return vmStatsById;
5870+
}
5871+
for (Map.Entry<String, VmStatsEntry> entry : vmStatsByName.entrySet()) {
5872+
vmStatsById.put(vmNames.get(entry.getKey()), entry.getValue());
5873+
}
5874+
}
5875+
return vmStatsById;
5876+
}
5877+
5878+
@Override
5879+
public HashMap<Long, List<? extends VmDiskStats>> getVmDiskStatistics(long hostId, String hostName, Map<Long, ? extends VirtualMachine> vmMap) {
5880+
HashMap<Long, List<? extends VmDiskStats>> vmDiskStatsById = new HashMap<>();
5881+
if (MapUtils.isEmpty(vmMap)) {
5882+
return vmDiskStatsById;
5883+
}
5884+
Map<String, Long> vmNames = new HashMap<>();
5885+
for (Map.Entry<Long, ? extends VirtualMachine> vmEntry : vmMap.entrySet()) {
5886+
vmNames.put(vmEntry.getValue().getInstanceName(), vmEntry.getKey());
5887+
}
5888+
Answer answer = _agentMgr.easySend(hostId, new GetVmDiskStatsCommand(new ArrayList<>(vmNames.keySet()), _hostDao.findById(hostId).getGuid(), hostName));
5889+
if (answer == null || !answer.getResult()) {
5890+
s_logger.warn("Unable to obtain VM disk statistics.");
5891+
return vmDiskStatsById;
5892+
} else {
5893+
HashMap<String, List<VmDiskStatsEntry>> vmDiskStatsByName = ((GetVmDiskStatsAnswer)answer).getVmDiskStatsMap();
5894+
if (vmDiskStatsByName == null) {
5895+
s_logger.warn("Unable to obtain VM disk statistics.");
5896+
return vmDiskStatsById;
5897+
}
5898+
for (Map.Entry<String, List<VmDiskStatsEntry>> entry: vmDiskStatsByName.entrySet()) {
5899+
vmDiskStatsById.put(vmNames.get(entry.getKey()), entry.getValue());
5900+
}
5901+
}
5902+
return vmDiskStatsById;
5903+
}
5904+
5905+
@Override
5906+
public HashMap<Long, List<? extends VmNetworkStats>> getVmNetworkStatistics(long hostId, String hostName, Map<Long, ? extends VirtualMachine> vmMap) {
5907+
HashMap<Long, List<? extends VmNetworkStats>> vmNetworkStatsById = new HashMap<>();
5908+
if (MapUtils.isEmpty(vmMap)) {
5909+
return vmNetworkStatsById;
5910+
}
5911+
Map<String, Long> vmNames = new HashMap<>();
5912+
for (Map.Entry<Long, ? extends VirtualMachine> vmEntry : vmMap.entrySet()) {
5913+
vmNames.put(vmEntry.getValue().getInstanceName(), vmEntry.getKey());
5914+
}
5915+
Answer answer = _agentMgr.easySend(hostId, new GetVmNetworkStatsCommand(new ArrayList<>(vmNames.keySet()), _hostDao.findById(hostId).getGuid(), hostName));
5916+
if (answer == null || !answer.getResult()) {
5917+
s_logger.warn("Unable to obtain VM network statistics.");
5918+
return vmNetworkStatsById;
5919+
} else {
5920+
HashMap<String, List<VmNetworkStatsEntry>> vmNetworkStatsByName = ((GetVmNetworkStatsAnswer)answer).getVmNetworkStatsMap();
5921+
if (vmNetworkStatsByName == null) {
5922+
s_logger.warn("Unable to obtain VM network statistics.");
5923+
return vmNetworkStatsById;
5924+
}
5925+
for (Map.Entry<String, List<VmNetworkStatsEntry>> entry: vmNetworkStatsByName.entrySet()) {
5926+
vmNetworkStatsById.put(vmNames.get(entry.getKey()), entry.getValue());
5927+
}
5928+
}
5929+
return vmNetworkStatsById;
5930+
}
58285931
}

0 commit comments

Comments
 (0)