acidvegas/elastop
acidvegas/elastop
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Fixed incorrect size letter shown

Browse Source
This commit is contained in:
Dionysus 2024-11-29 02:14:22 -05:00
parent 7ecdede375
commit 992943aa84
Signed by: acidvegas
GPG Key ID: EF4B922DB85DC9DE
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
elastop.go
View File

@ -254,11 +254,11 @@ func convertSizeFormat(sizeStr string) string {
return fmt.Sprintf("%d%s", int(size), unit) return fmt.Sprintf("%d%s", int(size), unit)
} }
// Update formatResourceSize to return just the number and unit // Update formatResourceSize to dynamically choose the appropriate unit
func formatResourceSize(bytes int64, targetUnit string) string { func formatResourceSize(bytes int64) string {
const unit = 1024 const unit = 1024
if bytes < unit { if bytes < unit {
return fmt.Sprintf("%3d%s", bytes, targetUnit) return fmt.Sprintf("%3d B", bytes)
} }
units := []string{"B", "K", "M", "G", "T", "P"} units := []string{"B", "K", "M", "G", "T", "P"}
@ -270,7 +270,8 @@ func formatResourceSize(bytes int64, targetUnit string) string {
exp++ exp++
} }
return fmt.Sprintf("%3d%s", int(val), targetUnit) // Format with appropriate unit instead of using targetUnit
return fmt.Sprintf("%3.1f%s", val, units[exp])
} }
// Add this helper function at package level // Add this helper function at package level
@ -685,16 +686,16 @@ func main() {
cpuPercent, cpuPercent,
nodeInfo.OS.AvailableProcessors, nodeInfo.OS.AvailableProcessors,
nodeLoads[nodeInfo.Name], nodeLoads[nodeInfo.Name],
formatResourceSize(nodeStats.OS.Memory.UsedInBytes, "G"), formatResourceSize(nodeStats.OS.Memory.UsedInBytes),
formatResourceSize(nodeStats.OS.Memory.TotalInBytes, "G"), formatResourceSize(nodeStats.OS.Memory.TotalInBytes),
getPercentageColor(memPercent), getPercentageColor(memPercent),
int(memPercent), int(memPercent),
formatResourceSize(nodeStats.JVM.Memory.HeapUsedInBytes, "G"), formatResourceSize(nodeStats.JVM.Memory.HeapUsedInBytes),
formatResourceSize(nodeStats.JVM.Memory.HeapMaxInBytes, "G"), formatResourceSize(nodeStats.JVM.Memory.HeapMaxInBytes),
getPercentageColor(heapPercent), getPercentageColor(heapPercent),
int(heapPercent), int(heapPercent),
formatResourceSize(diskUsed, "G"), formatResourceSize(diskUsed),
formatResourceSize(diskTotal, "T"), formatResourceSize(diskTotal),
getPercentageColor(diskPercent), getPercentageColor(diskPercent),
int(diskPercent), int(diskPercent),
nodeInfo.OS.PrettyName, nodeInfo.OS.PrettyName,