vendor: cadvisor v0.39.0

Main upgrades:
- github.com/opencontainers/runc v1.0.0-rc93
- github.com/containerd/containerd v1.4.4
- github.com/docker/docker v20.10.2
- github.com/mrunalp/fileutils v0.5.0
- github.com/opencontainers/selinux v1.8.0
- github.com/cilium/ebpf v0.2.0
This commit is contained in:
David Porter
2021-03-08 22:09:22 -08:00
parent faa3a5fbd4
commit b5dd78da3d
286 changed files with 7427 additions and 4415 deletions

View File

@@ -455,6 +455,16 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc, includedMetri
},
}...)
}
if includedMetrics.Has(container.CPUSetMetrics) {
c.containerMetrics = append(c.containerMetrics, containerMetric{
name: "container_memory_migrate",
help: "Memory migrate status.",
valueType: prometheus.GaugeValue,
getValues: func(s *info.ContainerStats) metricValues {
return metricValues{{value: float64(s.CpuSet.MemoryMigrate), timestamp: s.Timestamp}}
},
})
}
if includedMetrics.Has(container.MemoryNumaMetrics) {
c.containerMetrics = append(c.containerMetrics, []containerMetric{
{
@@ -757,6 +767,28 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc, includedMetri
}, s.Timestamp)
},
},
{
name: "container_blkio_device_usage_total",
help: "Blkio Device bytes usage",
valueType: prometheus.CounterValue,
extraLabels: []string{"device", "major", "minor", "operation"},
getValues: func(s *info.ContainerStats) metricValues {
var values metricValues
for _, diskStat := range s.DiskIo.IoServiceBytes {
for operation, value := range diskStat.Stats {
values = append(values, metricValue{
value: float64(value),
labels: []string{diskStat.Device,
strconv.Itoa(int(diskStat.Major)),
strconv.Itoa(int(diskStat.Minor)),
operation},
timestamp: s.Timestamp,
})
}
}
return values
},
},
}...)
}
if includedMetrics.Has(container.NetworkUsageMetrics) {