prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix cpu limit to report cpu shares.

Browse Source 
It is currently treating shares as millicores.

Changed 'CPU Limit 1.024 cores' to 'CPU shares 1024 shares'.

Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
This commit is contained in:
Rohit Jnagal 2014-07-24 23:31:53 +00:00
parent f5fde119f8
commit befc11b899
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pages/containers.go
View File

@ -36,6 +36,7 @@ var funcMap = template.FuncMap{
"containerLink": containerLink, "containerLink": containerLink,
"printMask": printMask, "printMask": printMask,
"printCores": printCores, "printCores": printCores,
"printShares": printShares,
"printMegabytes": printMegabytes, "printMegabytes": printMegabytes,
"getMemoryUsage": getMemoryUsage, "getMemoryUsage": getMemoryUsage,
"getMemoryUsagePercent": getMemoryUsagePercent, "getMemoryUsagePercent": getMemoryUsagePercent,
@ -138,6 +139,10 @@ func printCores(millicores *uint64) string {
return strconv.FormatFloat(cores, 'f', 3, 64) return strconv.FormatFloat(cores, 'f', 3, 64)
} }
func printShares(shares *uint64) string {
return fmt.Sprintf("%d", *shares)
}
func toMegabytes(bytes uint64) float64 { func toMegabytes(bytes uint64) float64 {
return float64(bytes) / (1 << 20) return float64(bytes) / (1 << 20)
} }

2
pages/containers_html.go
View File

@ -68,7 +68,7 @@ const containersHtmlTemplate = `
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item active isolation-title panel-title">CPU</li> <li class="list-group-item active isolation-title panel-title">CPU</li>
{{if .Spec.Cpu.Limit}} {{if .Spec.Cpu.Limit}}
<li class="list-group-item"><span class="stat-label">Limit</span> {{printCores .Spec.Cpu.Limit}} <span class="unit-label">cores</span></li> <li class="list-group-item"><span class="stat-label">Shares</span> {{printShares .Spec.Cpu.Limit}} <span class="unit-label">shares</span></li>
{{end}} {{end}}
{{if .Spec.Cpu.MaxLimit}} {{if .Spec.Cpu.MaxLimit}}
<li class="list-group-item"><span class="stat-label">Max Limit</span> {{printCores .Spec.Cpu.MaxLimit}} <span class="unit-label">cores</span></li> <li class="list-group-item"><span class="stat-label">Max Limit</span> {{printCores .Spec.Cpu.MaxLimit}} <span class="unit-label">cores</span></li>