kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 02:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

tiny: Add MHz to node-status output

Browse Source
This commit is contained in:
Kenjiro Nakayama
2016-08-07 19:03:57 +09:00
parent f847db6d5d
commit cc61998d57
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
command/node_status.go
View File

@@ -410,7 +410,7 @@ func getAllocatedResources(client *api.Client, runningAllocs []*api.Allocation,
resources := make([]string, 2)
resources[0] = "CPU|Memory|Disk|IOPS"
resources[1] = fmt.Sprintf("%v/%v|%v/%v|%v/%v|%v/%v",
resources[1] = fmt.Sprintf("%v/%v MHz|%v/%v|%v/%v|%v/%v",
cpu,
total.CPU,
humanize.IBytes(uint64(mem*bytesPerMegabyte)),
@@ -461,7 +461,7 @@ func getActualResources(client *api.Client, runningAllocs []*api.Allocation, nod
resources := make([]string, 2)
resources[0] = "CPU|Memory"
resources[1] = fmt.Sprintf("%v/%v|%v/%v",
resources[1] = fmt.Sprintf("%v/%v MHz|%v/%v",
math.Floor(cpu),
total.CPU,
humanize.IBytes(mem),
@@ -489,7 +489,7 @@ func getHostResources(hostStats *api.HostStats, node *api.Node) ([]string, error
resources = make([]string, 2)
resources[0] = "CPU|Memory|Disk"
resources[1] = fmt.Sprintf("%v/%v|%v/%v|%v/%v",
resources[1] = fmt.Sprintf("%v/%v MHz|%v/%v|%v/%v",
math.Floor(hostStats.CPUTicksConsumed),
node.Resources.CPU,
humanize.IBytes(hostStats.Memory.Used),

48
website/source/docs/commands/node-status.html.md.erb
View File

@@ -96,16 +96,16 @@ Status = ready
Uptime = 17h42m50s
Allocated Resources
CPU Memory Disk IOPS
500/2600 256 MiB/2.0 GiB 300 MiB/32 GiB 0/0
CPU Memory Disk IOPS
500/2600 MHz 256 MiB/2.0 GiB 300 MiB/32 GiB 0/0
Allocation Resource Utilization
CPU Memory
430/2600 199 MiB/2.0 GiB
CPU Memory
430/2600 MHz 199 MiB/2.0 GiB
Host Resource Utilization
CPU Memory Disk
513/3000 551 MiB/2.4 GiB 4.2 GiB/52 GiB
CPU Memory Disk
513/3000 MHz 551 MiB/2.4 GiB 4.2 GiB/52 GiB
Allocations
ID Eval ID Job ID Task Group Desired Status Client Status
@@ -125,16 +125,16 @@ Status = ready
Uptime = 17h7m41s
Allocated Resources
CPU Memory Disk IOPS
2500/2600 1.3 GiB/2.0 GiB 1.5 GiB/32 GiB 0/0
CPU Memory Disk IOPS
2500/2600 MHz 1.3 GiB/2.0 GiB 1.5 GiB/32 GiB 0/0
Allocation Resource Utilization
CPU Memory
2200/2600 1.7 GiB/2.0 GiB
CPU Memory
2200/2600 MHz 1.7 GiB/2.0 GiB
Host Resource Utilization
CPU Memory Disk
2430/3000 1.8 GiB/2.4 GiB 6.5 GiB/40 GiB
CPU Memory Disk
2430/3000 MHz 1.8 GiB/2.4 GiB 6.5 GiB/40 GiB
Allocations
ID Eval ID Job ID Task Group Desired Status Client Status
@@ -158,16 +158,16 @@ Status = ready
Uptime = 17h7m41s
Allocated Resources
CPU Memory Disk IOPS
2500/2600 1.3 GiB/2.0 GiB 1.5 GiB/32 GiB 0/0
CPU Memory Disk IOPS
2500/2600 MHz 1.3 GiB/2.0 GiB 1.5 GiB/32 GiB 0/0
Allocation Resource Utilization
CPU Memory
2200/2600 1.7 GiB/2.0 GiB
CPU Memory
2200/2600 MHz 1.7 GiB/2.0 GiB
Host Resource Utilization
CPU Memory Disk
2430/3000 1.8 GiB/2.4 GiB 3.9 GiB/40 GiB
CPU Memory Disk
2430/3000 MHz 1.8 GiB/2.4 GiB 3.9 GiB/40 GiB
CPU Stats
CPU = cpu0
@@ -225,16 +225,16 @@ Status = ready
Uptime = 17h7m41s
Allocated Resources
CPU Memory Disk IOPS
2500/2600 1.3 GiB/2.0 GiB 1.5 GiB/32 GiB 0/0
CPU Memory Disk IOPS
2500/2600 MHz 1.3 GiB/2.0 GiB 1.5 GiB/32 GiB 0/0
Allocation Resource Utilization
CPU Memory
2200/2600 1.7 GiB/2.0 GiB
CPU Memory
2200/2600 MHz 1.7 GiB/2.0 GiB
Host Resource Utilization
CPU Memory Disk
230/3000 121 MiB/2.4 GiB 6.5 GiB/40 GiB
CPU Memory Disk
230/3000 MHz 121 MiB/2.4 GiB 6.5 GiB/40 GiB
Allocations
ID Eval ID Job ID Task Group Desired Status Client Status