github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update cgroups to 5933ab4dc4f7caa3a73a1dc141bd11f4

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-09-06 16:18:02 -04:00
parent 4c5ed9c068
commit 2ed3c62e27
14 changed files with 3861 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
metrics/cgroups/cpu.go
View File

@@ -17,12 +17,12 @@ var cpuMetrics = []*metric{
unit: metrics.Nanoseconds,
vt: prometheus.GaugeValue,
getValues: func(stats *cgroups.Metrics) []value {
if stats.Cpu == nil {
if stats.CPU == nil {
return nil
}
return []value{
{
v: float64(stats.Cpu.Usage.Total),
v: float64(stats.CPU.Usage.Total),
},
}
},
@@ -33,12 +33,12 @@ var cpuMetrics = []*metric{
unit: metrics.Nanoseconds,
vt: prometheus.GaugeValue,
getValues: func(stats *cgroups.Metrics) []value {
if stats.Cpu == nil {
if stats.CPU == nil {
return nil
}
return []value{
{
v: float64(stats.Cpu.Usage.Kernel),
v: float64(stats.CPU.Usage.Kernel),
},
}
},
@@ -49,12 +49,12 @@ var cpuMetrics = []*metric{
unit: metrics.Nanoseconds,
vt: prometheus.GaugeValue,
getValues: func(stats *cgroups.Metrics) []value {
if stats.Cpu == nil {
if stats.CPU == nil {
return nil
}
return []value{
{
v: float64(stats.Cpu.Usage.User),
v: float64(stats.CPU.Usage.User),
},
}
},
@@ -66,11 +66,11 @@ var cpuMetrics = []*metric{
vt: prometheus.GaugeValue,
labels: []string{"cpu"},
getValues: func(stats *cgroups.Metrics) []value {
if stats.Cpu == nil {
if stats.CPU == nil {
return nil
}
var out []value
for i, v := range stats.Cpu.Usage.PerCpu {
for i, v := range stats.CPU.Usage.PerCPU {
out = append(out, value{
v: float64(v),
l: []string{strconv.Itoa(i)},
@@ -85,12 +85,12 @@ var cpuMetrics = []*metric{
unit: metrics.Total,
vt: prometheus.GaugeValue,
getValues: func(stats *cgroups.Metrics) []value {
if stats.Cpu == nil {
if stats.CPU == nil {
return nil
}
return []value{
{
v: float64(stats.Cpu.Throttling.Periods),
v: float64(stats.CPU.Throttling.Periods),
},
}
},
@@ -101,12 +101,12 @@ var cpuMetrics = []*metric{
unit: metrics.Total,
vt: prometheus.GaugeValue,
getValues: func(stats *cgroups.Metrics) []value {
if stats.Cpu == nil {
if stats.CPU == nil {
return nil
}
return []value{
{
v: float64(stats.Cpu.Throttling.ThrottledPeriods),
v: float64(stats.CPU.Throttling.ThrottledPeriods),
},
}
},
@@ -117,12 +117,12 @@ var cpuMetrics = []*metric{
unit: metrics.Nanoseconds,
vt: prometheus.GaugeValue,
getValues: func(stats *cgroups.Metrics) []value {
if stats.Cpu == nil {
if stats.CPU == nil {
return nil
}
return []value{
{
v: float64(stats.Cpu.Throttling.ThrottledTime),
v: float64(stats.CPU.Throttling.ThrottledTime),
},
}
},

12
metrics/cgroups/hugetlb.go
View File

@@ -20,10 +20,10 @@ var hugetlbMetrics = []*metric{
return nil
}
var out []value
for page, v := range stats.Hugetlb {
for _, v := range stats.Hugetlb {
out = append(out, value{
v: float64(v.Usage),
l: []string{page},
l: []string{v.Pagesize},
})
}
return out
@@ -40,10 +40,10 @@ var hugetlbMetrics = []*metric{
return nil
}
var out []value
for page, v := range stats.Hugetlb {
for _, v := range stats.Hugetlb {
out = append(out, value{
v: float64(v.Failcnt),
l: []string{page},
l: []string{v.Pagesize},
})
}
return out
@@ -60,10 +60,10 @@ var hugetlbMetrics = []*metric{
return nil
}
var out []value
for page, v := range stats.Hugetlb {
for _, v := range stats.Hugetlb {
out = append(out, value{
v: float64(v.Max),
l: []string{page},
l: []string{v.Pagesize},
})
}
return out

16
metrics/cgroups/memory.go
View File

@@ -36,7 +36,7 @@ var memoryMetrics = []*metric{
}
return []value{
{
v: float64(stats.Memory.Rss),
v: float64(stats.Memory.RSS),
},
}
},
@@ -52,7 +52,7 @@ var memoryMetrics = []*metric{
}
return []value{
{
v: float64(stats.Memory.RssHuge),
v: float64(stats.Memory.RSSHuge),
},
}
},
@@ -308,7 +308,7 @@ var memoryMetrics = []*metric{
}
return []value{
{
v: float64(stats.Memory.TotalRss),
v: float64(stats.Memory.TotalRSS),
},
}
},
@@ -324,7 +324,7 @@ var memoryMetrics = []*metric{
}
return []value{
{
v: float64(stats.Memory.TotalRssHuge),
v: float64(stats.Memory.TotalRSSHuge),
},
}
},
@@ -724,7 +724,7 @@ var memoryMetrics = []*metric{
}
return []value{
{
v: float64(stats.Memory.KernelTcp.Failcnt),
v: float64(stats.Memory.KernelTCP.Failcnt),
},
}
},
@@ -740,7 +740,7 @@ var memoryMetrics = []*metric{
}
return []value{
{
v: float64(stats.Memory.KernelTcp.Limit),
v: float64(stats.Memory.KernelTCP.Limit),
},
}
},
@@ -756,7 +756,7 @@ var memoryMetrics = []*metric{
}
return []value{
{
v: float64(stats.Memory.KernelTcp.Max),
v: float64(stats.Memory.KernelTCP.Max),
},
}
},
@@ -772,7 +772,7 @@ var memoryMetrics = []*metric{
}
return []value{
{
v: float64(stats.Memory.KernelTcp.Usage),
v: float64(stats.Memory.KernelTCP.Usage),
},
}
},

2
metrics/cgroups/metrics.go
View File

@@ -123,7 +123,7 @@ func (c *Collector) Remove(id, namespace string) {
delete(c.cgroups, taskID(id, namespace))
}
func blkioValues(l []*cgroups.BlkioEntry) []value {
func blkioValues(l []*cgroups.BlkIOEntry) []value {
var out []value
for _, e := range l {
out = append(out, value{