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),
},
}
},