[ agent ] [ status ] - accomplish agent status - 4
This commit is contained in:
@@ -19,6 +19,18 @@
|
||||
<java.version>11</java.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- Operating System and Hardware Information library for Java -->
|
||||
<dependency>
|
||||
<groupId>com.github.oshi</groupId>
|
||||
<artifactId>oshi-core-java11</artifactId>
|
||||
<version>6.4.0</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
||||
<!-- <build>-->
|
||||
<!-- <plugins>-->
|
||||
<!-- <plugin>-->
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
package io.wdd.common.beans.status;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
import oshi.software.os.OperatingSystem;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@SuperBuilder(toBuilder = true)
|
||||
public class AgentStatus {
|
||||
|
||||
String time;
|
||||
|
||||
String agentName;
|
||||
|
||||
String agentTopicName;
|
||||
|
||||
|
||||
CpuInfo cpuInfo;
|
||||
|
||||
MemoryInfo memoryInfo;
|
||||
|
||||
List<DiskInfo> diskStoreInfo;
|
||||
|
||||
List<NetworkInfo> networkInfo;
|
||||
|
||||
OperatingSystem osInfo;
|
||||
|
||||
}
|
||||
123
common/src/main/java/io/wdd/common/beans/status/CpuInfo.java
Normal file
123
common/src/main/java/io/wdd/common/beans/status/CpuInfo.java
Normal file
@@ -0,0 +1,123 @@
|
||||
package io.wdd.common.beans.status;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import oshi.hardware.CentralProcessor;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
|
||||
@AllArgsConstructor
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public class CpuInfo {
|
||||
|
||||
|
||||
private static final DecimalFormat LOAD_FORMAT = new DecimalFormat("#.00");
|
||||
|
||||
/**
|
||||
* CPU总线程
|
||||
*/
|
||||
private Integer cpuTotal;
|
||||
|
||||
/**
|
||||
* CPU核心数
|
||||
* */
|
||||
private Integer coreTotal;
|
||||
|
||||
/**
|
||||
* CPU总数 计算方式理论上为 cpuTotal * 100
|
||||
*/
|
||||
private double cpuUsageTotol;
|
||||
|
||||
/**
|
||||
* CPU系统使用率
|
||||
*/
|
||||
private double systemCpuUsage;
|
||||
|
||||
/**
|
||||
* CPU用户使用率
|
||||
*/
|
||||
private double userCpuUsage;
|
||||
|
||||
/**
|
||||
* CPU当前等待率
|
||||
*/
|
||||
private double wait;
|
||||
|
||||
/**
|
||||
* CPU当前空闲率
|
||||
*/
|
||||
private double free;
|
||||
|
||||
/**
|
||||
* CPU型号信息
|
||||
*/
|
||||
private String cpuModel;
|
||||
|
||||
private double[] cpuLoadAverage;
|
||||
|
||||
private double[] systemLoadAverage;
|
||||
|
||||
/**
|
||||
* CPU型号信息
|
||||
*/
|
||||
private CpuTicks ticks;
|
||||
|
||||
|
||||
public CpuInfo(CentralProcessor processor, long waitingTime){
|
||||
this.init(processor, waitingTime);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取指定等待时间内系统CPU 系统使用率、用户使用率、利用率等等 相关信息
|
||||
*
|
||||
* @param processor {@link CentralProcessor}
|
||||
* @param waitingTime 设置等待时间,单位毫秒
|
||||
* @since 5.7.12
|
||||
*/
|
||||
private void init(CentralProcessor processor, long waitingTime) {
|
||||
|
||||
final CpuTicks ticks = new CpuTicks(processor, waitingTime);
|
||||
this.ticks = ticks;
|
||||
|
||||
this.cpuTotal = processor.getLogicalProcessorCount();
|
||||
this.coreTotal = processor.getPhysicalProcessorCount();
|
||||
|
||||
this.cpuModel = processor.toString();
|
||||
|
||||
final long totalCpu = ticks.totalCpu();
|
||||
this.cpuUsageTotol = totalCpu;
|
||||
|
||||
this.systemCpuUsage = formatDouble(ticks.cSys, totalCpu);
|
||||
this.userCpuUsage = formatDouble(ticks.user, totalCpu);
|
||||
|
||||
this.wait = formatDouble(ticks.ioWait, totalCpu);
|
||||
this.free = formatDouble(ticks.idle, totalCpu);
|
||||
|
||||
|
||||
// system load average
|
||||
this.systemLoadAverage = processor.getSystemLoadAverage(3);
|
||||
|
||||
// cpu load average
|
||||
this.cpuLoadAverage = processor.getProcessorCpuLoad(waitingTime);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取每个CPU核心的tick,计算方式为 100 * tick / totalCpu
|
||||
*
|
||||
* @param tick tick
|
||||
* @param totalCpu CPU总数
|
||||
* @return 平均每个CPU核心的tick
|
||||
* @since 5.7.12
|
||||
*/
|
||||
private static double formatDouble(long tick, long totalCpu) {
|
||||
if (0 == totalCpu) {
|
||||
return 0D;
|
||||
}
|
||||
return Double.parseDouble(LOAD_FORMAT.format(tick <= 0 ? 0 : (100d * tick / totalCpu)));
|
||||
}
|
||||
|
||||
}
|
||||
100
common/src/main/java/io/wdd/common/beans/status/CpuTicks.java
Normal file
100
common/src/main/java/io/wdd/common/beans/status/CpuTicks.java
Normal file
@@ -0,0 +1,100 @@
|
||||
package io.wdd.common.beans.status;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import oshi.hardware.CentralProcessor;
|
||||
import oshi.util.Util;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class CpuTicks {
|
||||
|
||||
long idle;
|
||||
|
||||
long nice;
|
||||
|
||||
long irq;
|
||||
|
||||
long softIrq;
|
||||
|
||||
long steal;
|
||||
|
||||
long cSys;
|
||||
|
||||
long user;
|
||||
|
||||
long ioWait;
|
||||
|
||||
private static int IDLEIndex;
|
||||
private static int NICEIndex;
|
||||
private static int IRQIndex;
|
||||
private static int SOFTIRQIndex;
|
||||
private static int STEALIndex;
|
||||
private static int SYSTEMIndex;
|
||||
private static int USERIndex;
|
||||
private static int IOWAITIndex;
|
||||
|
||||
static {
|
||||
|
||||
IDLEIndex = CentralProcessor.TickType.IDLE.getIndex();
|
||||
NICEIndex = CentralProcessor.TickType.NICE.getIndex();
|
||||
IRQIndex =CentralProcessor.TickType.IRQ.getIndex();
|
||||
SOFTIRQIndex = CentralProcessor.TickType.SOFTIRQ.getIndex();
|
||||
STEALIndex = CentralProcessor.TickType.STEAL.getIndex();
|
||||
SYSTEMIndex = CentralProcessor.TickType.SYSTEM.getIndex();
|
||||
USERIndex = CentralProcessor.TickType.USER.getIndex();
|
||||
IOWAITIndex = CentralProcessor.TickType.IOWAIT.getIndex();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 构造,等待时间为用于计算在一定时长内的CPU负载情况,如传入1000表示最近1秒的负载情况
|
||||
*
|
||||
* @param processor {@link CentralProcessor}
|
||||
* @param waitingTime 设置等待时间,单位毫秒
|
||||
*/
|
||||
public CpuTicks(CentralProcessor processor, long waitingTime) {
|
||||
// CPU信息
|
||||
final long[] prevTicks = processor.getSystemCpuLoadTicks();
|
||||
|
||||
// 这里必须要设置延迟
|
||||
Util.sleep(waitingTime);
|
||||
final long[] ticks = processor.getSystemCpuLoadTicks();
|
||||
|
||||
this.idle = tick(prevTicks, ticks, IDLEIndex);
|
||||
this.nice = tick(prevTicks, ticks, NICEIndex);
|
||||
this.irq = tick(prevTicks, ticks, IRQIndex);
|
||||
this.softIrq = tick(prevTicks, ticks, SOFTIRQIndex);
|
||||
this.steal = tick(prevTicks, ticks, STEALIndex);
|
||||
this.cSys = tick(prevTicks, ticks, SYSTEMIndex);
|
||||
this.user = tick(prevTicks, ticks, USERIndex);
|
||||
this.ioWait = tick(prevTicks, ticks, IOWAITIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取CPU总的使用率
|
||||
*
|
||||
* @return CPU总使用率
|
||||
*/
|
||||
public long totalCpu() {
|
||||
return Math.max(user + nice + cSys + idle + ioWait + irq + softIrq + steal, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取一段时间内的CPU负载标记差
|
||||
*
|
||||
* @param prevTicks 开始的ticks
|
||||
* @param ticks 结束的ticks
|
||||
* @param tickType tick类型
|
||||
* @return 标记差
|
||||
* @since 5.7.12
|
||||
*/
|
||||
private static long tick(long[] prevTicks, long[] ticks, int index) {
|
||||
return ticks[index] - prevTicks[index];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package io.wdd.common.beans.status;
|
||||
|
||||
import io.wdd.common.utils.FormatUtils;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
import oshi.hardware.HWDiskStore;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@SuperBuilder(toBuilder = true)
|
||||
public class DiskInfo {
|
||||
|
||||
String name;
|
||||
|
||||
String model;
|
||||
|
||||
String serial;
|
||||
|
||||
String size;
|
||||
|
||||
|
||||
private List<PartitionInfo> partitionInfoList;
|
||||
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@SuperBuilder(toBuilder = true)
|
||||
private static class PartitionInfo{
|
||||
|
||||
String path;
|
||||
|
||||
String type;
|
||||
|
||||
String size;
|
||||
|
||||
String mountPoint;
|
||||
|
||||
}
|
||||
|
||||
public static List<DiskInfo> mapFromDiskStore(List<HWDiskStore> hwDiskStoreList){
|
||||
|
||||
return hwDiskStoreList.stream().map(
|
||||
hwDiskStore -> DiskInfo.builder()
|
||||
.name(hwDiskStore.getName())
|
||||
.model(hwDiskStore.getModel())
|
||||
.serial(hwDiskStore.getSerial())
|
||||
.size(FormatUtils.formatData(hwDiskStore.getSize()))
|
||||
.partitionInfoList(
|
||||
// partition should also be got from stream
|
||||
hwDiskStore.getPartitions().stream().map(partition -> DiskInfo.PartitionInfo.builder()
|
||||
.path(partition.getIdentification())
|
||||
.size(FormatUtils.formatData(partition.getSize()))
|
||||
.type(partition.getType())
|
||||
.mountPoint(partition.getMountPoint())
|
||||
.build()
|
||||
).collect(Collectors.toList())
|
||||
)
|
||||
.build()
|
||||
).collect(Collectors.toList());
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package io.wdd.common.beans.status;
|
||||
|
||||
import io.wdd.common.utils.FormatUtils;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
import oshi.hardware.GlobalMemory;
|
||||
import oshi.hardware.VirtualMemory;
|
||||
|
||||
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Data
|
||||
@SuperBuilder(toBuilder = true)
|
||||
public class MemoryInfo {
|
||||
|
||||
|
||||
String total;
|
||||
|
||||
String usage;
|
||||
|
||||
String available;
|
||||
|
||||
String memoryType;
|
||||
|
||||
String swapTotal;
|
||||
|
||||
String swapAvailable;
|
||||
|
||||
String swapUsage;
|
||||
|
||||
public static MemoryInfo build(GlobalMemory memory) {
|
||||
|
||||
VirtualMemory virtualMemory = memory.getVirtualMemory();
|
||||
return MemoryInfo.builder()
|
||||
.memoryType(memory.getPhysicalMemory().get(0).getMemoryType())
|
||||
.total(FormatUtils.formatData(memory.getTotal()))
|
||||
.available(FormatUtils.formatData(memory.getAvailable()))
|
||||
.usage(FormatUtils.formatData(memory.getTotal() - memory.getAvailable()))
|
||||
.swapTotal(FormatUtils.formatData(virtualMemory.getSwapTotal()))
|
||||
.swapUsage(FormatUtils.formatData(virtualMemory.getSwapUsed()))
|
||||
.swapAvailable(FormatUtils.formatData(virtualMemory.getSwapTotal() - virtualMemory.getSwapUsed()))
|
||||
.build();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package io.wdd.common.beans.status;
|
||||
|
||||
|
||||
import io.wdd.common.utils.FormatUtils;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
import oshi.hardware.NetworkIF;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@SuperBuilder(toBuilder = true)
|
||||
public class NetworkInfo {
|
||||
|
||||
private String name;
|
||||
private String displayName;
|
||||
|
||||
private String macAddr;
|
||||
|
||||
private String mtu;
|
||||
|
||||
private String[] ipv4Addr;
|
||||
private String[] ipv6Addr;
|
||||
|
||||
private String trafficRecv;
|
||||
|
||||
private String trafficSend;
|
||||
|
||||
public static List<NetworkInfo> mapFromNetworkIFS(List<NetworkIF> networkIFList) {
|
||||
|
||||
return networkIFList.stream().map(networkIF -> NetworkInfo.builder().name(networkIF.getName()).displayName(networkIF.getDisplayName()).mtu(String.valueOf(networkIF.getMTU())).macAddr(networkIF.getMacaddr()).ipv4Addr(generateIPDICRFromNetworkIFList(networkIF, 4)).ipv6Addr(generateIPDICRFromNetworkIFList(networkIF, 6)).trafficSend(FormatUtils.formatData(networkIF.getBytesSent())).trafficRecv(FormatUtils.formatData(networkIF.getBytesRecv())).build()).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private static String[] generateIPDICRFromNetworkIFList(NetworkIF networkIF, int Ipv4OrIpv6) {
|
||||
|
||||
String[] iPAddr;
|
||||
Short[] subnetMasks;
|
||||
|
||||
if (Ipv4OrIpv6 == 4) {
|
||||
iPAddr = networkIF.getIPv4addr();
|
||||
subnetMasks = networkIF.getSubnetMasks();
|
||||
} else {
|
||||
iPAddr = networkIF.getIPv6addr();
|
||||
subnetMasks = networkIF.getPrefixLengths();
|
||||
}
|
||||
|
||||
String[] result = new String[iPAddr.length];
|
||||
for (int index = 0; index < iPAddr.length; index++) {
|
||||
result[index] = iPAddr[index] + "/" + subnetMasks[index];
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
64
common/src/main/java/io/wdd/common/utils/DataUnit.java
Normal file
64
common/src/main/java/io/wdd/common/utils/DataUnit.java
Normal file
@@ -0,0 +1,64 @@
|
||||
package io.wdd.common.utils;
|
||||
|
||||
import org.springframework.util.unit.DataSize;
|
||||
|
||||
/**
|
||||
* 数据单位封装<p>
|
||||
* 此类来自于:Spring-framework
|
||||
*
|
||||
* <pre>
|
||||
* BYTES 1B 2^0 1
|
||||
* KILOBYTES 1KB 2^10 1,024
|
||||
* MEGABYTES 1MB 2^20 1,048,576
|
||||
* GIGABYTES 1GB 2^30 1,073,741,824
|
||||
* TERABYTES 1TB 2^40 1,099,511,627,776
|
||||
* </pre>
|
||||
*
|
||||
* @author Sam Brannen,Stephane Nicoll
|
||||
* @since 5.3.10
|
||||
*/
|
||||
public enum DataUnit {
|
||||
|
||||
/**
|
||||
* Bytes, 后缀表示为: {@code B}.
|
||||
*/
|
||||
BYTES("B", DataSize.ofBytes(1)),
|
||||
|
||||
/**
|
||||
* Kilobytes, 后缀表示为: {@code KB}.
|
||||
*/
|
||||
KILOBYTES("KB", DataSize.ofKilobytes(1)),
|
||||
|
||||
/**
|
||||
* Megabytes, 后缀表示为: {@code MB}.
|
||||
*/
|
||||
MEGABYTES("MB", DataSize.ofMegabytes(1)),
|
||||
|
||||
/**
|
||||
* Gigabytes, 后缀表示为: {@code GB}.
|
||||
*/
|
||||
GIGABYTES("GB", DataSize.ofGigabytes(1)),
|
||||
|
||||
/**
|
||||
* Terabytes, 后缀表示为: {@code TB}.
|
||||
*/
|
||||
TERABYTES("TB", DataSize.ofTerabytes(1));
|
||||
|
||||
public static final String[] UNIT_NAMES = new String[]{"B", "KB", "MB", "GB", "TB", "PB", "EB"};
|
||||
|
||||
private final String suffix;
|
||||
|
||||
private final DataSize size;
|
||||
|
||||
|
||||
DataUnit(String suffix, DataSize size) {
|
||||
this.suffix = suffix;
|
||||
this.size = size;
|
||||
}
|
||||
|
||||
DataSize size() {
|
||||
return this.size;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
33
common/src/main/java/io/wdd/common/utils/FormatUtils.java
Normal file
33
common/src/main/java/io/wdd/common/utils/FormatUtils.java
Normal file
@@ -0,0 +1,33 @@
|
||||
package io.wdd.common.utils;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
|
||||
public class FormatUtils {
|
||||
|
||||
|
||||
/**
|
||||
* 格式化输出百分比
|
||||
*
|
||||
* @param rate
|
||||
* @return
|
||||
*/
|
||||
public static String formatRate(double rate) {
|
||||
return new DecimalFormat("#.##%").format(rate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 格式化输出大小 B/KB/MB...
|
||||
*
|
||||
* @param size
|
||||
* @return
|
||||
*/
|
||||
public static String formatData(long size) {
|
||||
if (size <= 0L) {
|
||||
return "0B";
|
||||
} else {
|
||||
int digitGroups = Math.min(DataUnit.UNIT_NAMES.length - 1, (int) (Math.log10((double) size) / Math.log10(1024.0D)));
|
||||
return (new DecimalFormat("#,##0.##")).format((double) size / Math.pow(1024.0D, digitGroups)) + " " + DataUnit.UNIT_NAMES[digitGroups];
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user