luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

unify units

This commit is contained in:
Alex Dadgar 2016-06-11 21:01:53 -07:00
parent 974c713b4d
commit a49bb31561
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
command/node_status.go
View File

@ -16,6 +16,9 @@ import (
const (
// floatFormat is a format string for formatting floats.
floatFormat = "#,###.##"
// bytesPerMegabyte is the number of bytes per MB
bytesPerMegabyte = 1024 * 1024
)
type NodeStatusCommand struct {
@ -402,14 +405,14 @@ func getAllocatedResources(client *api.Client, runningAllocs []*api.Allocation,
}
resources := make([]string, 2)
resources[0] = "CPU|Memory MB|Disk MB|IOPS"
resources[0] = "CPU|Memory|Disk|IOPS"
resources[1] = fmt.Sprintf("%v/%v|%v/%v|%v/%v|%v/%v",
cpu,
total.CPU,
mem,
total.MemoryMB,
disk,
total.DiskMB,
humanize.Bytes(uint64(mem*bytesPerMegabyte)),
humanize.Bytes(uint64(total.MemoryMB*bytesPerMegabyte)),
humanize.Bytes(uint64(disk*bytesPerMegabyte)),
humanize.Bytes(uint64(total.DiskMB*bytesPerMegabyte)),
iops,
total.IOPS)
@ -452,14 +455,13 @@ func getActualResources(client *api.Client, runningAllocs []*api.Allocation, nod
mem += stats.ResourceUsage.MemoryStats.RSS
}
// TODO do humanized output for these
resources := make([]string, 2)
resources[0] = "CPU|Memory"
resources[1] = fmt.Sprintf("%v/%v|%v/%v",
math.Floor(cpu),
total.CPU,
humanize.Bytes(mem),
humanize.Bytes(uint64(total.MemoryMB*1024*1024)))
humanize.Bytes(uint64(total.MemoryMB*bytesPerMegabyte)))
return resources, nil
}