diff --git a/pom.xml b/pom.xml index 8a7b5bc..f743389 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.imyeyu.timiserverapi TimiServerAPI - 1.0.0 + 1.0.1 jar TimiServerAPI imyeyu.com API diff --git a/src/main/java/com/imyeyu/api/modules/system/bean/ServerStatus.java b/src/main/java/com/imyeyu/api/modules/system/bean/ServerStatus.java index 8266f17..566aeaa 100644 --- a/src/main/java/com/imyeyu/api/modules/system/bean/ServerStatus.java +++ b/src/main/java/com/imyeyu/api/modules/system/bean/ServerStatus.java @@ -348,10 +348,10 @@ public class ServerStatus implements TimiJava { private String mountPoint; /** 分区总空间 */ - private long totalBytes; + private long total; /** 分区已用空间 */ - private Long usedBytes; + private Long used; /** 磁盘传输耗时 */ private long transferTimeMs; diff --git a/src/main/java/com/imyeyu/api/modules/system/controller/DockerController.java b/src/main/java/com/imyeyu/api/modules/system/controller/DockerController.java index 31b7c73..918a026 100644 --- a/src/main/java/com/imyeyu/api/modules/system/controller/DockerController.java +++ b/src/main/java/com/imyeyu/api/modules/system/controller/DockerController.java @@ -26,17 +26,17 @@ public class DockerController { private final DockerService dockerService; - @GetMapping("/containers") + @GetMapping("/container") public List listContainers() { return dockerService.listContainers(); } - @GetMapping("/containers/{containerId}/status") + @GetMapping("/container/{containerId}/status") public DockerContainerStatusView getContainerStatus(@PathVariable String containerId) { return dockerService.getContainerStatus(containerId); } - @GetMapping("/containers/{containerId}/history") + @GetMapping("/container/{containerId}/history") public DockerContainerHistoryView getContainerHistory(@PathVariable String containerId, @RequestParam(required = false) String window) { return dockerService.getContainerHistory(containerId, window); } diff --git a/src/main/java/com/imyeyu/api/modules/system/service/implement/StatusServiceImplement.java b/src/main/java/com/imyeyu/api/modules/system/service/implement/StatusServiceImplement.java index b496556..105122d 100644 --- a/src/main/java/com/imyeyu/api/modules/system/service/implement/StatusServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/system/service/implement/StatusServiceImplement.java @@ -72,7 +72,6 @@ public class StatusServiceImplement implements StatusService { SystemStatusDataView.OS os = new SystemStatusDataView.OS(); os.setName(serverStatus.getOs().getName()); os.setBootAt(serverStatus.getOs().getBootAt()); - os.setUptimeMs(Math.max(0, serverTime - serverStatus.getOs().getBootAt())); snapshot.setOs(os); } if (selectedMetrics.contains(Metric.CPU)) { @@ -80,8 +79,8 @@ public class StatusServiceImplement implements StatusService { cpu.setModel(serverStatus.getCpu().getName()); cpu.setPhysicalCores(serverStatus.getCpu().getCoreCount()); cpu.setLogicalCores(serverStatus.getCpu().getLogicalCount()); - cpu.setUsagePercent(lastDouble(serverStatus.getCpu().getUsed())); - cpu.setSystemPercent(lastDouble(serverStatus.getCpu().getSystem())); + cpu.setUsageTotal(lastDouble(serverStatus.getCpu().getUsed())); + cpu.setUsageSystem(lastDouble(serverStatus.getCpu().getSystem())); cpu.setTemperatureCelsius(serverStatus.getCpu().getTemperature()); snapshot.setCpu(cpu); } @@ -91,7 +90,6 @@ public class StatusServiceImplement implements StatusService { Long swapUsedBytes = lastLong(serverStatus.getMemory().getSwapUsed()); memory.setTotalBytes(serverStatus.getMemory().getSize()); memory.setUsedBytes(usedBytes); - memory.setUsagePercent(toPercent(usedBytes, serverStatus.getMemory().getSize())); memory.setSwapTotalBytes(serverStatus.getMemory().getSwapSize()); memory.setSwapUsedBytes(swapUsedBytes); snapshot.setMemory(memory); @@ -160,9 +158,9 @@ public class StatusServiceImplement implements StatusService { item.setPartitionType(partition.getPartitionType()); item.setUuid(partition.getUuid()); item.setMountPoint(partition.getMountPoint()); - item.setTotalBytes(partition.getTotalBytes()); - item.setUsedBytes(partition.getUsedBytes()); - item.setUsagePercent(toPercent(partition.getUsedBytes(), partition.getTotalBytes())); + item.setTotal(partition.getTotal()); + item.setUsed(partition.getUsed()); + item.setUsagePercent(toPercent(partition.getUsed(), partition.getTotal())); item.setTransferTimeMs(partition.getTransferTimeMs()); storagePartitions.add(item); } diff --git a/src/main/java/com/imyeyu/api/modules/system/service/implement/UpsServiceImplement.java b/src/main/java/com/imyeyu/api/modules/system/service/implement/UpsServiceImplement.java index d7f2c87..e3f4543 100644 --- a/src/main/java/com/imyeyu/api/modules/system/service/implement/UpsServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/system/service/implement/UpsServiceImplement.java @@ -23,7 +23,7 @@ public class UpsServiceImplement implements UpsService { private final UpsStatusTask upsStatusTask; private final UpsStatusStore upsStatusStore; - @Value("${ups.collect-rate-ms:60000}") + @Value("${ups.collect-rate-ms:3000}") private long collectRateMs; @Override diff --git a/src/main/java/com/imyeyu/api/modules/system/task/UpsStatusTask.java b/src/main/java/com/imyeyu/api/modules/system/task/UpsStatusTask.java index f84eca1..1064bc9 100644 --- a/src/main/java/com/imyeyu/api/modules/system/task/UpsStatusTask.java +++ b/src/main/java/com/imyeyu/api/modules/system/task/UpsStatusTask.java @@ -28,7 +28,7 @@ public class UpsStatusTask implements SchedulingConfigurer { private final UpsStatusClient upsStatusClient; private final UpsStatusStore upsStatusStore; - @Value("${ups.collect-enabled:false}") + @Value("${ups.collect-enabled:true}") private boolean collectEnabled; @Value("${ups.collect-rate-ms:60000}") diff --git a/src/main/java/com/imyeyu/api/modules/system/task/status/collector/CpuStatusCollector.java b/src/main/java/com/imyeyu/api/modules/system/task/status/collector/CpuStatusCollector.java index 6e4ac04..e3ab48c 100644 --- a/src/main/java/com/imyeyu/api/modules/system/task/status/collector/CpuStatusCollector.java +++ b/src/main/java/com/imyeyu/api/modules/system/task/status/collector/CpuStatusCollector.java @@ -38,10 +38,10 @@ public class CpuStatusCollector extends AbstractDequeStatusCollector { long irq = ticks[CentralProcessor.TickType.IRQ.getIndex()] - lastCpuTicks[CentralProcessor.TickType.IRQ.getIndex()]; long softIrq = ticks[CentralProcessor.TickType.SOFTIRQ.getIndex()] - lastCpuTicks[CentralProcessor.TickType.SOFTIRQ.getIndex()]; long steal = ticks[CentralProcessor.TickType.STEAL.getIndex()] - lastCpuTicks[CentralProcessor.TickType.STEAL.getIndex()]; - long total = user + nice + sys + idle + ioWait + irq + softIrq + steal; + double total = user + nice + sys + idle + ioWait + irq + softIrq + steal; if (0 < total) { - putDeque(context, context.getStatus().getCpu().getSystem(), 100D * sys / total); - putDeque(context, context.getStatus().getCpu().getUsed(), 100 - 100D * idle / total); + putDeque(context, context.getStatus().getCpu().getSystem(), sys / total); + putDeque(context, context.getStatus().getCpu().getUsed(), 1 - idle / total); } } lastCpuTicks = ticks; diff --git a/src/main/java/com/imyeyu/api/modules/system/task/status/collector/StorageStatusCollector.java b/src/main/java/com/imyeyu/api/modules/system/task/status/collector/StorageStatusCollector.java index edbd1cb..a000869 100644 --- a/src/main/java/com/imyeyu/api/modules/system/task/status/collector/StorageStatusCollector.java +++ b/src/main/java/com/imyeyu/api/modules/system/task/status/collector/StorageStatusCollector.java @@ -38,13 +38,13 @@ public class StorageStatusCollector implements StatusCollector { item.setPartitionType(partition.getType()); item.setUuid(partition.getUuid()); item.setMountPoint(partition.getMountPoint()); - item.setTotalBytes(partition.getSize()); + item.setTotal(partition.getSize()); item.setTransferTimeMs(diskStore.getTransferTime()); OSFileStore fileStore = matchFileStore(partition, fileStoreMap); if (fileStore != null) { fileStore.updateAttributes(); - item.setUsedBytes(fileStore.getTotalSpace() - fileStore.getUsableSpace()); + item.setUsed(fileStore.getTotalSpace() - fileStore.getUsableSpace()); } context.getStatus().getStoragePartitions().add(item); } diff --git a/src/main/java/com/imyeyu/api/modules/system/vo/SystemStatusDataView.java b/src/main/java/com/imyeyu/api/modules/system/vo/SystemStatusDataView.java index a13a587..5f141a0 100644 --- a/src/main/java/com/imyeyu/api/modules/system/vo/SystemStatusDataView.java +++ b/src/main/java/com/imyeyu/api/modules/system/vo/SystemStatusDataView.java @@ -101,9 +101,6 @@ public class SystemStatusDataView { /** 启动时间 */ private long bootAt; - - /** 运行时长 */ - private long uptimeMs; } /** @@ -125,10 +122,10 @@ public class SystemStatusDataView { private int logicalCores; /** 总占用 */ - private Double usagePercent; + private Double usageTotal; /** 系统占用 */ - private Double systemPercent; + private Double usageSystem; /** 温度 */ private double temperatureCelsius; @@ -149,9 +146,6 @@ public class SystemStatusDataView { /** 已用内存 */ private Long usedBytes; - /** 使用率 */ - private Double usagePercent; - /** 交换分区总量 */ private long swapTotalBytes; @@ -364,10 +358,10 @@ public class SystemStatusDataView { private String mountPoint; /** 分区总空间 */ - private long totalBytes; + private long total; /** 已用空间 */ - private Long usedBytes; + private Long used; /** 使用率 */ private Double usagePercent;