change the monitor model,using the newest
This commit is contained in:
parent
35acd78e27
commit
cc2fbb0bed
|
@ -8,7 +8,7 @@ import javax.xml.bind.annotation.XmlElementWrapper;
|
|||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
import org.bench4q.share.models.monitor.LogicalDiskModel;
|
||||
import org.bench4q.share.models.monitor.PhysicalDiskModel;
|
||||
|
||||
/**
|
||||
* When asked for logicalDisk, this model will be response
|
||||
|
@ -18,25 +18,25 @@ import org.bench4q.share.models.monitor.LogicalDiskModel;
|
|||
*/
|
||||
@XmlRootElement(name = "MonitorLogicalDiskResponseModel")
|
||||
public class MonitorLogicalDiskResponseModel implements MonitorResultBase {
|
||||
private List<LogicalDiskModel> logicalDiskModels;
|
||||
private List<PhysicalDiskModel> logicalDiskModels;
|
||||
|
||||
@XmlElementWrapper
|
||||
@XmlElement(name = "logicalDiskModel")
|
||||
public List<LogicalDiskModel> getLogicalDiskModels() {
|
||||
public List<PhysicalDiskModel> getLogicalDiskModels() {
|
||||
return logicalDiskModels;
|
||||
}
|
||||
|
||||
public void setLogicalDiskModels(List<LogicalDiskModel> logicalDiskModels) {
|
||||
public void setLogicalDiskModels(List<PhysicalDiskModel> logicalDiskModels) {
|
||||
this.logicalDiskModels = logicalDiskModels;
|
||||
}
|
||||
|
||||
public MonitorLogicalDiskResponseModel() {
|
||||
this.setLogicalDiskModels(new ArrayList<LogicalDiskModel>());
|
||||
this.setLogicalDiskModels(new ArrayList<PhysicalDiskModel>());
|
||||
}
|
||||
|
||||
public void add(SampleModel model) {
|
||||
if (model instanceof LogicalDiskModel) {
|
||||
this.getLogicalDiskModels().add((LogicalDiskModel) model);
|
||||
if (model instanceof PhysicalDiskModel) {
|
||||
this.getLogicalDiskModels().add((PhysicalDiskModel) model);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3,22 +3,22 @@ package org.bench4q.share.models.master;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.bench4q.share.models.monitor.LogicalDiskModel;
|
||||
import org.bench4q.share.models.monitor.MemoryModel;
|
||||
import org.bench4q.share.models.monitor.NetworkInterfaceModel;
|
||||
import org.bench4q.share.models.monitor.PhysicalDiskModel;
|
||||
import org.bench4q.share.models.monitor.ProcessorModel;
|
||||
|
||||
public class MonitorResultContainerModel {
|
||||
private List<LogicalDiskModel> logicalDiskModels;
|
||||
private List<PhysicalDiskModel> logicalDiskModels;
|
||||
private List<MemoryModel> memoryModels;
|
||||
private List<ProcessorModel> processorModels;
|
||||
private List<NetworkInterfaceModel> netWorkModels;
|
||||
|
||||
public List<LogicalDiskModel> getLogicalDiskModels() {
|
||||
public List<PhysicalDiskModel> getLogicalDiskModels() {
|
||||
return logicalDiskModels;
|
||||
}
|
||||
|
||||
public void setLogicalDiskModels(List<LogicalDiskModel> logicalDiskModels) {
|
||||
public void setLogicalDiskModels(List<PhysicalDiskModel> logicalDiskModels) {
|
||||
this.logicalDiskModels = logicalDiskModels;
|
||||
}
|
||||
|
||||
|
@ -47,7 +47,7 @@ public class MonitorResultContainerModel {
|
|||
}
|
||||
|
||||
public MonitorResultContainerModel() {
|
||||
this.setLogicalDiskModels(new ArrayList<LogicalDiskModel>());
|
||||
this.setLogicalDiskModels(new ArrayList<PhysicalDiskModel>());
|
||||
this.setMemoryModels(new ArrayList<MemoryModel>());
|
||||
this.setProcessorModels(new ArrayList<ProcessorModel>());
|
||||
this.setNetWorkModels(new ArrayList<NetworkInterfaceModel>());
|
||||
|
|
|
@ -15,7 +15,6 @@ public class ScriptBriefResultModel extends SampleModel {
|
|||
private long failThroughputThisTime;
|
||||
private long responseTimeDeviationThisTime;
|
||||
private long failRateThisTime;
|
||||
|
||||
private long averageElapsedTime;
|
||||
private long planedRunningTime;
|
||||
private long vUserCount;
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "fileSystem")
|
||||
public class FileSystemModel {
|
||||
public class FileSystemModel extends SampleModel{
|
||||
private String fileDir;
|
||||
private Double diskReadKBytesRate;
|
||||
private Double diskWriteKBytesRate;
|
|
@ -1,31 +0,0 @@
|
|||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "LogicalDisk")
|
||||
public class LogicalDiskModel extends SampleModel {
|
||||
|
||||
private List<LogicalDiskModelChild> logicalDiskList;
|
||||
|
||||
public LogicalDiskModel() {
|
||||
this.logicalDiskList = new ArrayList<LogicalDiskModelChild>();
|
||||
}
|
||||
|
||||
@XmlElementWrapper
|
||||
@XmlElement(name = "Instance", type = LogicalDiskModelChild.class)
|
||||
public List<LogicalDiskModelChild> getLogicalDiskList() {
|
||||
return logicalDiskList;
|
||||
}
|
||||
|
||||
public void setLogicalDiskList(
|
||||
ArrayList<LogicalDiskModelChild> logicalDiskList) {
|
||||
this.logicalDiskList = logicalDiskList;
|
||||
}
|
||||
}
|
|
@ -1,159 +0,0 @@
|
|||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement
|
||||
public class LogicalDiskModelChild extends SampleModel {
|
||||
private String instance;
|
||||
private double freeSpacePercent;
|
||||
private double freeMegabytes;
|
||||
|
||||
// <EFBFBD><EFBFBD><EFBFBD>̻<EFBFBD>ٷֱ<EFBFBD>
|
||||
private double diskTimePercent;
|
||||
private double diskReadTimePercent;
|
||||
private double diskWriteTimePercent;
|
||||
|
||||
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƽ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>?
|
||||
private double averageDiskTransferTimeInSecond;
|
||||
private double averageDiskReadTimeInSecond;
|
||||
private double averageDiskWriteTimeInSecond;
|
||||
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֽ<EFBFBD>?
|
||||
|
||||
private double diskBytesPerSecond;
|
||||
|
||||
private double diskReadBytesPerSecond;
|
||||
private double diskWriteBytesPerSecond;
|
||||
|
||||
// <EFBFBD><EFBFBD><EFBFBD>аٷֱ<EFBFBD>
|
||||
private double idleTimePercent;
|
||||
// ƽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>г<EFBFBD><EFBFBD><EFBFBD>?
|
||||
private double averageDiskQueueLength;
|
||||
// <EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD>г<EFBFBD><EFBFBD><EFBFBD>
|
||||
private double currentDiskQueueLength;
|
||||
|
||||
public String getInstance() {
|
||||
return instance;
|
||||
}
|
||||
|
||||
public void setInstance(String instance) {
|
||||
this.instance = instance;
|
||||
}
|
||||
|
||||
public double getFreeSpacePercent() {
|
||||
return freeSpacePercent;
|
||||
}
|
||||
|
||||
public void setFreeSpacePercent(double freeSpacePercent) {
|
||||
this.freeSpacePercent = freeSpacePercent;
|
||||
}
|
||||
|
||||
public double getFreeMegabytes() {
|
||||
return freeMegabytes;
|
||||
}
|
||||
|
||||
public void setFreeMegabytes(double freeMegabytes) {
|
||||
this.freeMegabytes = freeMegabytes;
|
||||
}
|
||||
|
||||
public double getDiskTimePercent() {
|
||||
return diskTimePercent;
|
||||
}
|
||||
|
||||
public void setDiskTimePercent(double diskTimePercent) {
|
||||
this.diskTimePercent = diskTimePercent;
|
||||
}
|
||||
|
||||
public double getDiskReadTimePercent() {
|
||||
return diskReadTimePercent;
|
||||
}
|
||||
|
||||
public void setDiskReadTimePercent(double diskReadTimePercent) {
|
||||
this.diskReadTimePercent = diskReadTimePercent;
|
||||
}
|
||||
|
||||
public double getDiskWriteTimePercent() {
|
||||
return diskWriteTimePercent;
|
||||
}
|
||||
|
||||
public void setDiskWriteTimePercent(double diskWriteTimePercent) {
|
||||
this.diskWriteTimePercent = diskWriteTimePercent;
|
||||
}
|
||||
|
||||
public double getAverageDiskTransferTimeInSecond() {
|
||||
return averageDiskTransferTimeInSecond;
|
||||
}
|
||||
|
||||
public void setAverageDiskTransferTimeInSecond(
|
||||
double averageDiskTransferTimeInSecond) {
|
||||
this.averageDiskTransferTimeInSecond = averageDiskTransferTimeInSecond;
|
||||
}
|
||||
|
||||
public double getAverageDiskReadTimeInSecond() {
|
||||
return averageDiskReadTimeInSecond;
|
||||
}
|
||||
|
||||
public void setAverageDiskReadTimeInSecond(
|
||||
double averageDiskReadTimeInSecond) {
|
||||
this.averageDiskReadTimeInSecond = averageDiskReadTimeInSecond;
|
||||
}
|
||||
|
||||
public double getAverageDiskWriteTimeInSecond() {
|
||||
return averageDiskWriteTimeInSecond;
|
||||
}
|
||||
|
||||
public void setAverageDiskWriteTimeInSecond(
|
||||
double averageDiskWriteTimeInSecond) {
|
||||
this.averageDiskWriteTimeInSecond = averageDiskWriteTimeInSecond;
|
||||
}
|
||||
|
||||
public double getDiskBytesPerSecond() {
|
||||
return diskBytesPerSecond;
|
||||
}
|
||||
|
||||
public void setDiskBytesPerSecond(double diskBytesPerSecond) {
|
||||
this.diskBytesPerSecond = diskBytesPerSecond;
|
||||
}
|
||||
|
||||
public double getDiskReadBytesPerSecond() {
|
||||
return diskReadBytesPerSecond;
|
||||
}
|
||||
|
||||
public void setDiskReadBytesPerSecond(double diskReadBytesPerSecond) {
|
||||
this.diskReadBytesPerSecond = diskReadBytesPerSecond;
|
||||
}
|
||||
|
||||
public double getDiskWriteBytesPerSecond() {
|
||||
return diskWriteBytesPerSecond;
|
||||
}
|
||||
|
||||
public void setDiskWriteBytesPerSecond(double diskkWriteBytesPerSecond) {
|
||||
this.diskWriteBytesPerSecond = diskkWriteBytesPerSecond;
|
||||
}
|
||||
|
||||
public double getIdleTimePercent() {
|
||||
return idleTimePercent;
|
||||
}
|
||||
|
||||
public void setIdleTimePercent(double idleTimePercent) {
|
||||
this.idleTimePercent = idleTimePercent;
|
||||
}
|
||||
|
||||
public double getAverageDiskQueueLength() {
|
||||
return averageDiskQueueLength;
|
||||
}
|
||||
|
||||
public void setAverageDiskQueueLength(double averageDiskQueueLength) {
|
||||
this.averageDiskQueueLength = averageDiskQueueLength;
|
||||
}
|
||||
|
||||
public double getCurrentDiskQueueLength() {
|
||||
return currentDiskQueueLength;
|
||||
}
|
||||
|
||||
public void setCurrentDiskQueueLength(double currentDiskQueueLength) {
|
||||
this.currentDiskQueueLength = currentDiskQueueLength;
|
||||
}
|
||||
|
||||
}
|
|
@ -1,73 +1,94 @@
|
|||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "Memory")
|
||||
public class MemoryModel extends SampleModel {
|
||||
|
||||
// private double pageFaultsPerSecond;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӳȱҳ
|
||||
private double pagesPerSecond;
|
||||
private double pagesInputPerSecond;
|
||||
private double pagesOutputPerSecond;
|
||||
private double cacheBytes;
|
||||
private double committedBytes;// ռ<EFBFBD>õ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD>ֽ<EFBFBD>?
|
||||
private double availableKiloBytes;
|
||||
|
||||
@XmlElement
|
||||
public double getPagesPerSecond() {
|
||||
return pagesPerSecond;
|
||||
}
|
||||
|
||||
public void setPagesPerSecond(double pagesPerSecond) {
|
||||
this.pagesPerSecond = pagesPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getPagesInputPerSecond() {
|
||||
return pagesInputPerSecond;
|
||||
}
|
||||
|
||||
public void setPagesInputPerSecond(double pagesInputPerSecond) {
|
||||
this.pagesInputPerSecond = pagesInputPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getCacheBytes() {
|
||||
return cacheBytes;
|
||||
}
|
||||
|
||||
public void setCacheBytes(double cacheBytes) {
|
||||
this.cacheBytes = cacheBytes;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getCommittedBytes() {
|
||||
return committedBytes;
|
||||
}
|
||||
|
||||
public void setCommittedBytes(double committedBytes) {
|
||||
this.committedBytes = committedBytes;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getPagesOutputPerSecond() {
|
||||
return pagesOutputPerSecond;
|
||||
}
|
||||
|
||||
public void setPagesOutputPerSecond(double pagesOutputPerSecond) {
|
||||
this.pagesOutputPerSecond = pagesOutputPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getAvailableKiloBytes() {
|
||||
return availableKiloBytes;
|
||||
}
|
||||
|
||||
public void setAvailableKiloBytes(double availableKiloBytes) {
|
||||
this.availableKiloBytes = availableKiloBytes;
|
||||
}
|
||||
|
||||
}
|
||||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "Memory")
|
||||
public class MemoryModel extends SampleModel{
|
||||
private long pagesPerSecond;
|
||||
private long pagesInputPerSecond;
|
||||
private long pagesOutputPerSecond;
|
||||
private long availableKiloBytes;
|
||||
private long totalKiloBytes;
|
||||
private double memoryUsedPercent;
|
||||
private double swapKiloBytes;
|
||||
private double swapFreeKiloBytes;
|
||||
|
||||
public MemoryModel() {
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getPagesPerSecond() {
|
||||
return pagesPerSecond;
|
||||
}
|
||||
|
||||
public void setPagesPerSecond(long pagesPerSecond) {
|
||||
this.pagesPerSecond = pagesPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getPagesInputPerSecond() {
|
||||
return pagesInputPerSecond;
|
||||
}
|
||||
|
||||
public void setPagesInputPerSecond(long pagesInputPerSecond) {
|
||||
this.pagesInputPerSecond = pagesInputPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getPagesOutputPerSecond() {
|
||||
return pagesOutputPerSecond;
|
||||
}
|
||||
|
||||
public void setPagesOutputPerSecond(long pagesOutputPerSecond) {
|
||||
this.pagesOutputPerSecond = pagesOutputPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getAvailableKiloBytes() {
|
||||
return availableKiloBytes;
|
||||
}
|
||||
|
||||
public void setAvailableKiloBytes(long availableKiloBytes) {
|
||||
this.availableKiloBytes = availableKiloBytes;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getTotalKiloBytes() {
|
||||
return totalKiloBytes;
|
||||
}
|
||||
|
||||
public void setTotalKiloBytes(long totalKiloBytes) {
|
||||
this.totalKiloBytes = totalKiloBytes;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getMemoryUsedPercent() {
|
||||
return memoryUsedPercent;
|
||||
}
|
||||
|
||||
public void setMemoryUsedPercent(double memoryUsedPercent) {
|
||||
this.memoryUsedPercent = memoryUsedPercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getSwapKiloBytes() {
|
||||
return swapKiloBytes;
|
||||
}
|
||||
|
||||
public void setSwapKiloBytes(double swapKiloBytes) {
|
||||
this.swapKiloBytes = swapKiloBytes;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getSwapFreeKiloBytes() {
|
||||
return swapFreeKiloBytes;
|
||||
}
|
||||
|
||||
public void setSwapFreeKiloBytes(double swapFreeKiloBytes) {
|
||||
this.swapFreeKiloBytes = swapFreeKiloBytes;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "history")
|
||||
@XmlType
|
||||
public class MainModel {
|
||||
@XmlElement
|
||||
private String date;
|
||||
public class MonitorMain extends SampleModel{
|
||||
@XmlElement(name = "processor_info")
|
||||
private ProcessorModel processorModel;
|
||||
@XmlElement(name = "memory_info")
|
||||
|
@ -20,7 +20,7 @@ public class MainModel {
|
|||
@XmlElement(name = "process_info")
|
||||
private ProcessModel processModel;
|
||||
|
||||
public MainModel() {
|
||||
public MonitorMain() {
|
||||
|
||||
}
|
||||
}
|
|
@ -1,29 +1,44 @@
|
|||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "NetworkInterface")
|
||||
public class NetworkInterfaceModel extends SampleModel {
|
||||
private List<NetworkInterfaceModelChild> networkList;
|
||||
|
||||
@XmlElementWrapper
|
||||
@XmlElement(name = "Instance", type = NetworkInterfaceModelChild.class)
|
||||
public List<NetworkInterfaceModelChild> getNetworkList() {
|
||||
return networkList;
|
||||
}
|
||||
|
||||
public void setNetworkList(List<NetworkInterfaceModelChild> networkList) {
|
||||
this.networkList = networkList;
|
||||
}
|
||||
|
||||
public NetworkInterfaceModel() {
|
||||
this.networkList = new ArrayList<NetworkInterfaceModelChild>();
|
||||
}
|
||||
}
|
||||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "NetworkInterface")
|
||||
public class NetworkInterfaceModel extends SampleModel{
|
||||
private Double kiloBytesTotalPerSecond;
|
||||
private Double kiloBytesReceivedPerSecond;
|
||||
private Double kiloBytesSentPerSecond;
|
||||
|
||||
public NetworkInterfaceModel() {
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public Double getKiloBytesTotalPerSecond() {
|
||||
return kiloBytesTotalPerSecond;
|
||||
}
|
||||
|
||||
public void setKiloBytesTotalPerSecond(Double kiloBytesTotalPerSecond) {
|
||||
this.kiloBytesTotalPerSecond = kiloBytesTotalPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public Double getKiloBytesReceivedPerSecond() {
|
||||
return kiloBytesReceivedPerSecond;
|
||||
}
|
||||
|
||||
public void setKiloBytesReceivedPerSecond(Double kiloBytesReceivedPerSecond) {
|
||||
this.kiloBytesReceivedPerSecond = kiloBytesReceivedPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public Double getKiloBytesSentPerSecond() {
|
||||
return kiloBytesSentPerSecond;
|
||||
}
|
||||
|
||||
public void setKiloBytesSentPerSecond(Double kiloBytesSentPerSecond) {
|
||||
this.kiloBytesSentPerSecond = kiloBytesSentPerSecond;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
@XmlRootElement
|
||||
public class NetworkInterfaceModelChild {
|
||||
private double bytesTotalPerSecond;
|
||||
private double bytesReceivedPerSecond;
|
||||
private double bytesSentPerSecond;
|
||||
private String instance;
|
||||
public double getBytesReceivedPerSecond() {
|
||||
return bytesReceivedPerSecond;
|
||||
}
|
||||
|
||||
public void setBytesReceivedPerSecond(double bytesReceivedPerSecond) {
|
||||
this.bytesReceivedPerSecond = bytesReceivedPerSecond;
|
||||
}
|
||||
|
||||
public double getBytesSentPerSecond() {
|
||||
return bytesSentPerSecond;
|
||||
}
|
||||
|
||||
public void setBytesSentPerSecond(double bytesSentPerSecond) {
|
||||
this.bytesSentPerSecond = bytesSentPerSecond;
|
||||
}
|
||||
|
||||
|
||||
public String getInstance() {
|
||||
return instance;
|
||||
}
|
||||
|
||||
public void setInstance(String instance) {
|
||||
this.instance = instance;
|
||||
}
|
||||
|
||||
public double getBytesTotalPerSecond() {
|
||||
return bytesTotalPerSecond;
|
||||
}
|
||||
|
||||
public void setBytesTotalPerSecond(double bytesTotalPerSecond) {
|
||||
this.bytesTotalPerSecond = bytesTotalPerSecond;
|
||||
}
|
||||
|
||||
}
|
|
@ -1,13 +1,15 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@XmlRootElement(name = "PhysicalDisk")
|
||||
public class PhysicalDiskModel {
|
||||
public class PhysicalDiskModel extends SampleModel{
|
||||
private Double diskReadKBytesRate;
|
||||
private Double diskWriteKBytesRate;
|
||||
private double curDiskQueLength;
|
|
@ -1,4 +1,4 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
@ -6,8 +6,10 @@ import javax.xml.bind.annotation.XmlElement;
|
|||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "Process")
|
||||
public class ProcessModel {
|
||||
public class ProcessModel extends SampleModel {
|
||||
private List<ProcessModelChild> processModelList;
|
||||
private long[] processPids;
|
||||
private List<String> processNameList;
|
|
@ -1,10 +1,12 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement
|
||||
public class ProcessModelChild {
|
||||
public class ProcessModelChild extends SampleModel {
|
||||
private String instanceString;
|
||||
private long residentKBytes;
|
||||
private double processorTimePercent;
|
|
@ -1,30 +1,87 @@
|
|||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "Processor")
|
||||
public class ProcessorModel extends SampleModel {
|
||||
private List<ProcessorModelChild> processorModelList;
|
||||
|
||||
public ProcessorModel() {
|
||||
processorModelList = new ArrayList<ProcessorModelChild>();
|
||||
}
|
||||
|
||||
@XmlElementWrapper
|
||||
@XmlElement(name = "processorModelChild", type = ProcessorModelChild.class)
|
||||
public List<ProcessorModelChild> getProcessorModelList() {
|
||||
return processorModelList;
|
||||
}
|
||||
|
||||
public void setProcessorModelList(
|
||||
List<ProcessorModelChild> processorModelList) {
|
||||
this.processorModelList = processorModelList;
|
||||
}
|
||||
}
|
||||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement(name = "Processors")
|
||||
public class ProcessorModel extends SampleModel{
|
||||
private List<ProcessorModelChild> processorModelList;
|
||||
private double processorTimePercent;
|
||||
private double privilegedTimePercent;
|
||||
private double userTimePercent;
|
||||
private double speed;
|
||||
private List<String> cpuInstanceList;
|
||||
private int size;
|
||||
|
||||
@XmlElementWrapper(name = "processorList")
|
||||
@XmlElement(name = "processorInstance", type = ProcessorModelChild.class)
|
||||
public List<ProcessorModelChild> getProcessorModelList() {
|
||||
return processorModelList;
|
||||
}
|
||||
|
||||
public void setProcessorModelList(
|
||||
List<ProcessorModelChild> processorModelList) {
|
||||
this.processorModelList = processorModelList;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getProcessorTimePercent() {
|
||||
return processorTimePercent;
|
||||
}
|
||||
|
||||
public void setProcessorTimePercent(double processorTimePercent) {
|
||||
this.processorTimePercent = processorTimePercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getPrivilegedTimePercent() {
|
||||
return privilegedTimePercent;
|
||||
}
|
||||
|
||||
public void setPrivilegedTimePercent(double privilegedTimePercent) {
|
||||
this.privilegedTimePercent = privilegedTimePercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getUserTimePercent() {
|
||||
return userTimePercent;
|
||||
}
|
||||
|
||||
public void setUserTimePercent(double userTimePercent) {
|
||||
this.userTimePercent = userTimePercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getSpeed() {
|
||||
return speed;
|
||||
}
|
||||
|
||||
public void setSpeed(double speed) {
|
||||
this.speed = speed;
|
||||
}
|
||||
|
||||
@XmlElementWrapper(name = "processorNameList")
|
||||
@XmlElement(name = "processorName", type = String.class)
|
||||
public List<String> getCpuInstanceList() {
|
||||
return cpuInstanceList;
|
||||
}
|
||||
|
||||
public void setCpuInstanceList(List<String> cpuInstanceList) {
|
||||
this.cpuInstanceList = cpuInstanceList;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public int getSize() {
|
||||
return size;
|
||||
}
|
||||
|
||||
public void setSize(int size) {
|
||||
this.size = size;
|
||||
}
|
||||
|
||||
}
|
|
@ -1,37 +1,51 @@
|
|||
package org.bench4q.share.models.monitor;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import org.bench4q.share.models.master.statistics.SampleModel;
|
||||
|
||||
@XmlRootElement
|
||||
public class ProcessorModelChild {
|
||||
public class ProcessorModelChild extends SampleModel{
|
||||
private String instance;
|
||||
private Double processorTimePercent;
|
||||
private Double userTimePercent;
|
||||
private Double privilegedTimePercent;
|
||||
|
||||
private double processorTimePercent;
|
||||
private double userTimePercent;
|
||||
private double privilegedTimePercent;
|
||||
|
||||
@XmlElement
|
||||
public String getInstance() {
|
||||
return instance;
|
||||
}
|
||||
|
||||
public void setInstance(String instance) {
|
||||
this.instance = instance;
|
||||
}
|
||||
public Double getProcessorTimePercent() {
|
||||
|
||||
@XmlElement
|
||||
public double getProcessorTimePercent() {
|
||||
return processorTimePercent;
|
||||
}
|
||||
public void setProcessorTimePercent(Double processorTimePercent) {
|
||||
|
||||
public void setProcessorTimePercent(double processorTimePercent) {
|
||||
this.processorTimePercent = processorTimePercent;
|
||||
}
|
||||
public Double getUserTimePercent() {
|
||||
|
||||
@XmlElement
|
||||
public double getUserTimePercent() {
|
||||
return userTimePercent;
|
||||
}
|
||||
public void setUserTimePercent(Double userTimePercent) {
|
||||
|
||||
public void setUserTimePercent(double userTimePercent) {
|
||||
this.userTimePercent = userTimePercent;
|
||||
}
|
||||
public Double getPrivilegedTimePercent() {
|
||||
|
||||
@XmlElement
|
||||
public double getPrivilegedTimePercent() {
|
||||
return privilegedTimePercent;
|
||||
}
|
||||
public void setPrivilegedTimePercent(Double privilegedTimePercent) {
|
||||
|
||||
public void setPrivilegedTimePercent(double privilegedTimePercent) {
|
||||
this.privilegedTimePercent = privilegedTimePercent;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
@XmlRootElement(name = "historylist")
|
||||
public class ListMainModel {
|
||||
private List<MainModel> historylist;
|
||||
@XmlElementWrapper(name = "histories")
|
||||
@XmlElement(name = "history", type = MainModel.class)
|
||||
public List<MainModel> getHistorylist() {
|
||||
return historylist;
|
||||
}
|
||||
|
||||
public void setHistorylist(List<MainModel> historylist) {
|
||||
this.historylist = historylist;
|
||||
}
|
||||
|
||||
}
|
|
@ -1,92 +0,0 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
@XmlRootElement(name = "Memory")
|
||||
public class MemoryModel {
|
||||
private long pagesPerSecond;
|
||||
private long pagesInputPerSecond;
|
||||
private long pagesOutputPerSecond;
|
||||
private long availableKiloBytes;
|
||||
private long totalKiloBytes;
|
||||
private double memoryUsedPercent;
|
||||
private double swapKiloBytes;
|
||||
private double swapFreeKiloBytes;
|
||||
|
||||
public MemoryModel() {
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getPagesPerSecond() {
|
||||
return pagesPerSecond;
|
||||
}
|
||||
|
||||
public void setPagesPerSecond(long pagesPerSecond) {
|
||||
this.pagesPerSecond = pagesPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getPagesInputPerSecond() {
|
||||
return pagesInputPerSecond;
|
||||
}
|
||||
|
||||
public void setPagesInputPerSecond(long pagesInputPerSecond) {
|
||||
this.pagesInputPerSecond = pagesInputPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getPagesOutputPerSecond() {
|
||||
return pagesOutputPerSecond;
|
||||
}
|
||||
|
||||
public void setPagesOutputPerSecond(long pagesOutputPerSecond) {
|
||||
this.pagesOutputPerSecond = pagesOutputPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getAvailableKiloBytes() {
|
||||
return availableKiloBytes;
|
||||
}
|
||||
|
||||
public void setAvailableKiloBytes(long availableKiloBytes) {
|
||||
this.availableKiloBytes = availableKiloBytes;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public long getTotalKiloBytes() {
|
||||
return totalKiloBytes;
|
||||
}
|
||||
|
||||
public void setTotalKiloBytes(long totalKiloBytes) {
|
||||
this.totalKiloBytes = totalKiloBytes;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getMemoryUsedPercent() {
|
||||
return memoryUsedPercent;
|
||||
}
|
||||
|
||||
public void setMemoryUsedPercent(double memoryUsedPercent) {
|
||||
this.memoryUsedPercent = memoryUsedPercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getSwapKiloBytes() {
|
||||
return swapKiloBytes;
|
||||
}
|
||||
|
||||
public void setSwapKiloBytes(double swapKiloBytes) {
|
||||
this.swapKiloBytes = swapKiloBytes;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getSwapFreeKiloBytes() {
|
||||
return swapFreeKiloBytes;
|
||||
}
|
||||
|
||||
public void setSwapFreeKiloBytes(double swapFreeKiloBytes) {
|
||||
this.swapFreeKiloBytes = swapFreeKiloBytes;
|
||||
}
|
||||
|
||||
}
|
|
@ -1,42 +0,0 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
@XmlRootElement(name = "NetworkInterface")
|
||||
public class NetworkInterfaceModel {
|
||||
private Double kiloBytesTotalPerSecond;
|
||||
private Double kiloBytesReceivedPerSecond;
|
||||
private Double kiloBytesSentPerSecond;
|
||||
|
||||
public NetworkInterfaceModel() {
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public Double getKiloBytesTotalPerSecond() {
|
||||
return kiloBytesTotalPerSecond;
|
||||
}
|
||||
|
||||
public void setKiloBytesTotalPerSecond(Double kiloBytesTotalPerSecond) {
|
||||
this.kiloBytesTotalPerSecond = kiloBytesTotalPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public Double getKiloBytesReceivedPerSecond() {
|
||||
return kiloBytesReceivedPerSecond;
|
||||
}
|
||||
|
||||
public void setKiloBytesReceivedPerSecond(Double kiloBytesReceivedPerSecond) {
|
||||
this.kiloBytesReceivedPerSecond = kiloBytesReceivedPerSecond;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public Double getKiloBytesSentPerSecond() {
|
||||
return kiloBytesSentPerSecond;
|
||||
}
|
||||
|
||||
public void setKiloBytesSentPerSecond(Double kiloBytesSentPerSecond) {
|
||||
this.kiloBytesSentPerSecond = kiloBytesSentPerSecond;
|
||||
}
|
||||
|
||||
}
|
|
@ -1,85 +0,0 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
@XmlRootElement(name = "Processors")
|
||||
public class ProcessorModel {
|
||||
private List<ProcessorModelChild> processorModelList;
|
||||
private double processorTimePercent;
|
||||
private double privilegedTimePercent;
|
||||
private double userTimePercent;
|
||||
private double speed;
|
||||
private List<String> cpuInstanceList;
|
||||
private int size;
|
||||
|
||||
@XmlElementWrapper(name = "processorList")
|
||||
@XmlElement(name = "processorInstance", type = ProcessorModelChild.class)
|
||||
public List<ProcessorModelChild> getProcessorModelList() {
|
||||
return processorModelList;
|
||||
}
|
||||
|
||||
public void setProcessorModelList(
|
||||
List<ProcessorModelChild> processorModelList) {
|
||||
this.processorModelList = processorModelList;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getProcessorTimePercent() {
|
||||
return processorTimePercent;
|
||||
}
|
||||
|
||||
public void setProcessorTimePercent(double processorTimePercent) {
|
||||
this.processorTimePercent = processorTimePercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getPrivilegedTimePercent() {
|
||||
return privilegedTimePercent;
|
||||
}
|
||||
|
||||
public void setPrivilegedTimePercent(double privilegedTimePercent) {
|
||||
this.privilegedTimePercent = privilegedTimePercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getUserTimePercent() {
|
||||
return userTimePercent;
|
||||
}
|
||||
|
||||
public void setUserTimePercent(double userTimePercent) {
|
||||
this.userTimePercent = userTimePercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getSpeed() {
|
||||
return speed;
|
||||
}
|
||||
|
||||
public void setSpeed(double speed) {
|
||||
this.speed = speed;
|
||||
}
|
||||
|
||||
@XmlElementWrapper(name = "processorNameList")
|
||||
@XmlElement(name = "processorName", type = String.class)
|
||||
public List<String> getCpuInstanceList() {
|
||||
return cpuInstanceList;
|
||||
}
|
||||
|
||||
public void setCpuInstanceList(List<String> cpuInstanceList) {
|
||||
this.cpuInstanceList = cpuInstanceList;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public int getSize() {
|
||||
return size;
|
||||
}
|
||||
|
||||
public void setSize(int size) {
|
||||
this.size = size;
|
||||
}
|
||||
|
||||
}
|
|
@ -1,49 +0,0 @@
|
|||
package org.bench4q.share.models.monitor.latest;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
@XmlRootElement
|
||||
public class ProcessorModelChild {
|
||||
private String instance;
|
||||
private double processorTimePercent;
|
||||
private double userTimePercent;
|
||||
private double privilegedTimePercent;
|
||||
|
||||
@XmlElement
|
||||
public String getInstance() {
|
||||
return instance;
|
||||
}
|
||||
|
||||
public void setInstance(String instance) {
|
||||
this.instance = instance;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getProcessorTimePercent() {
|
||||
return processorTimePercent;
|
||||
}
|
||||
|
||||
public void setProcessorTimePercent(double processorTimePercent) {
|
||||
this.processorTimePercent = processorTimePercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getUserTimePercent() {
|
||||
return userTimePercent;
|
||||
}
|
||||
|
||||
public void setUserTimePercent(double userTimePercent) {
|
||||
this.userTimePercent = userTimePercent;
|
||||
}
|
||||
|
||||
@XmlElement
|
||||
public double getPrivilegedTimePercent() {
|
||||
return privilegedTimePercent;
|
||||
}
|
||||
|
||||
public void setPrivilegedTimePercent(double privilegedTimePercent) {
|
||||
this.privilegedTimePercent = privilegedTimePercent;
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue