zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ agent ] [ status ] - accomplish agent status - 5

Browse Source
This commit is contained in:
zeaslity
2023-01-05 15:36:18 +08:00
parent c600de8202
commit ff66acb950
6 changed files with 111 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
agent/src/main/java/io/wdd/agent/config/utils/TimeUtils.java
View File

@@ -1,26 +0,0 @@
package io.wdd.agent.config.utils;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
public class TimeUtils {
public static ByteBuffer currentTimeByteBuffer() {
byte[] timeBytes = LocalDateTime.now(ZoneId.of("UTC+8")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).getBytes(StandardCharsets.UTF_8);
return ByteBuffer.wrap(timeBytes);
}
/**
* @return UTC+8 [ yyyy-MM-dd HH:mm:ss ] Time String
*/
public static String currentTimeString() {
return LocalDateTime.now(ZoneId.of("UTC+8")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
}
}

7
agent/src/main/java/io/wdd/agent/executor/redis/StreamSender.java
View File

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.wdd.agent.config.beans.executor.CommandLog;
import io.wdd.agent.config.beans.executor.StreamSenderEntity;
import io.wdd.agent.config.utils.TimeUtils;
import io.wdd.common.utils.TimeUtils;
import io.wdd.agent.executor.thread.LogToArrayListCache;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -20,11 +20,6 @@ import org.springframework.data.redis.connection.stream.StringRecord;
import org.springframework.data.redis.core.RedisTemplate;
import javax.annotation.Resource;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

15
agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java
View File

@@ -3,13 +3,8 @@ package io.wdd.agent.status;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.wdd.agent.config.beans.init.AgentServerInfo;
import io.wdd.agent.config.utils.TimeUtils;
import io.wdd.common.beans.status.CpuInfo;
import io.wdd.common.beans.status.DiskInfo;
import io.wdd.common.beans.status.MemoryInfo;
import io.wdd.common.beans.status.NetworkInfo;
import io.wdd.common.beans.status.AgentStatus;
import io.wdd.common.utils.FormatUtils;
import io.wdd.common.beans.status.*;
import io.wdd.common.utils.TimeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.connection.stream.StreamRecords;
import org.springframework.data.redis.connection.stream.StringRecord;
@@ -17,7 +12,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import oshi.SystemInfo;
import oshi.hardware.HWDiskStore;
import oshi.hardware.HardwareAbstractionLayer;
import oshi.software.os.OperatingSystem;
@@ -25,7 +19,6 @@ import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
@Slf4j
@@ -82,7 +75,9 @@ public class AgentStatusCollector {
);
/* operating system info */
agentStatus.setOsInfo(os);
agentStatus.setOsInfo(
AgentSystemInfo.mapFromOHSISystem(os)
);
/* Time */
agentStatus.setTime(TimeUtils.currentTimeString());