[ Agent ] [ Status ] - refresh status part

2023-12-20 15:50:08 +08:00
parent 3312052645
commit 4d56083b5a
15 changed files with 423 additions and 68 deletions
--- a/agent-go/status/Memory.go
+++ b/agent-go/status/Memory.go
@@ -5,29 +5,106 @@ import (
 	"github.com/shirou/gopsutil/v3/mem"
 )

-type MemoryStatus struct {
-	TotalMemory        uint64
-	UsedMemory         uint64
-	AvailableMemory    uint64
-	TotalVirtualMemory uint64
-	UsedVirtualMemory  uint64
+type MemoryMetric struct {
+	TotalMemory     uint64
+	AvailableMemory uint64
+	UsedMemory      uint64
+	UsedPercent     float64 `json:"usedPercent"`
+	FreeMemory      uint64  `json:"free"`
 }

-func GetMemoryStatus() (*MemoryStatus, error) {
-	memoryStatus := &MemoryStatus{}
+type MemoryInfo struct {
+	MemoryMetric
+	Buffers        uint64 `json:"buffers"`
+	Cached         uint64 `json:"cached"`
+	WriteBack      uint64 `json:"writeBack"`
+	Dirty          uint64 `json:"dirty"`
+	WriteBackTmp   uint64 `json:"writeBackTmp"`
+	Shared         uint64 `json:"shared"`
+	Slab           uint64 `json:"slab"`
+	Sreclaimable   uint64 `json:"sreclaimable"`
+	Sunreclaim     uint64 `json:"sunreclaim"`
+	PageTables     uint64 `json:"pageTables"`
+	SwapCached     uint64 `json:"swapCached"`
+	CommitLimit    uint64 `json:"commitLimit"`
+	CommittedAS    uint64 `json:"committedAS"`
+	HighTotal      uint64 `json:"highTotal"`
+	HighFree       uint64 `json:"highFree"`
+	LowTotal       uint64 `json:"lowTotal"`
+	LowFree        uint64 `json:"lowFree"`
+	SwapTotal      uint64 `json:"swapTotal"`
+	SwapFree       uint64 `json:"swapFree"`
+	Mapped         uint64 `json:"mapped"`
+	VmallocTotal   uint64 `json:"vmallocTotal"`
+	VmallocUsed    uint64 `json:"vmallocUsed"`
+	VmallocChunk   uint64 `json:"vmallocChunk"`
+	HugePagesTotal uint64 `json:"hugePagesTotal"`
+	HugePagesFree  uint64 `json:"hugePagesFree"`
+	HugePagesRsvd  uint64 `json:"hugePagesRsvd"`
+	HugePagesSurp  uint64 `json:"hugePagesSurp"`
+	HugePageSize   uint64 `json:"hugePageSize"`
+}
+
+func GetMemoryStatus() (*MemoryMetric, error) {
+	virtualMemoryStat, err := mem.VirtualMemory()
+	if err != nil {
+		return nil, err
+	}
+
+	return &MemoryMetric{
+		TotalMemory:     virtualMemoryStat.Total,
+		AvailableMemory: virtualMemoryStat.Available,
+		UsedMemory:      virtualMemoryStat.Used,
+		UsedPercent:     virtualMemoryStat.UsedPercent,
+		FreeMemory:      virtualMemoryStat.Free,
+	}, nil
+
+}
+
+func GetMemoryInfo() (*MemoryInfo, error) {

 	virtualMemoryStat, err := mem.VirtualMemory()
 	if err != nil {
-		return memoryStatus, err
+		return nil, err
 	}

-	memoryStatus.TotalMemory = virtualMemoryStat.Total
-	memoryStatus.UsedMemory = virtualMemoryStat.Used
-	memoryStatus.AvailableMemory = virtualMemoryStat.Available
-	memoryStatus.TotalVirtualMemory = virtualMemoryStat.Total
-	memoryStatus.UsedVirtualMemory = virtualMemoryStat.Used
-
-	return memoryStatus, nil
+	return &MemoryInfo{
+		MemoryMetric: MemoryMetric{
+			TotalMemory:     virtualMemoryStat.Total,
+			AvailableMemory: virtualMemoryStat.Available,
+			UsedMemory:      virtualMemoryStat.Used,
+			UsedPercent:     virtualMemoryStat.UsedPercent,
+			FreeMemory:      virtualMemoryStat.Free,
+		},
+		Buffers:        virtualMemoryStat.Buffers,
+		Cached:         virtualMemoryStat.Cached,
+		WriteBack:      virtualMemoryStat.WriteBack,
+		Dirty:          virtualMemoryStat.Dirty,
+		WriteBackTmp:   virtualMemoryStat.WriteBackTmp,
+		Shared:         virtualMemoryStat.Shared,
+		Slab:           virtualMemoryStat.Slab,
+		Sreclaimable:   virtualMemoryStat.Sreclaimable,
+		Sunreclaim:     virtualMemoryStat.Sunreclaim,
+		PageTables:     virtualMemoryStat.PageTables,
+		SwapCached:     virtualMemoryStat.SwapCached,
+		CommitLimit:    virtualMemoryStat.CommitLimit,
+		CommittedAS:    virtualMemoryStat.CommittedAS,
+		HighTotal:      virtualMemoryStat.HighTotal,
+		HighFree:       virtualMemoryStat.HighFree,
+		LowTotal:       virtualMemoryStat.LowTotal,
+		LowFree:        virtualMemoryStat.LowFree,
+		SwapTotal:      virtualMemoryStat.SwapTotal,
+		SwapFree:       virtualMemoryStat.SwapFree,
+		Mapped:         virtualMemoryStat.Mapped,
+		VmallocTotal:   virtualMemoryStat.VmallocTotal,
+		VmallocUsed:    virtualMemoryStat.VmallocUsed,
+		VmallocChunk:   virtualMemoryStat.VmallocChunk,
+		HugePagesTotal: virtualMemoryStat.HugePagesTotal,
+		HugePagesFree:  virtualMemoryStat.HugePagesFree,
+		HugePagesRsvd:  virtualMemoryStat.HugePagesRsvd,
+		HugePagesSurp:  virtualMemoryStat.HugePagesSurp,
+		HugePageSize:   virtualMemoryStat.HugePageSize,
+	}, nil
 }

 func FormatMemorySize(size uint64) string {