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

make cpu metrics consistent with v2 docs

Browse Source 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
This commit is contained in:
Boris Popovschi
2019-12-17 12:22:55 +02:00
parent 929ab521c6
commit b9d9bdf1fd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
metrics/cgroups/v2/cpu.go
View File

@@ -26,7 +26,7 @@ import (
var cpuMetrics = []*metric{ var cpuMetrics = []*metric{
{ {
name: "cpu_usage", name: "cpu_usage_usec",
help: "Total cpu usage (cgroup v2)", help: "Total cpu usage (cgroup v2)",
unit: metrics.Unit("microseconds"), unit: metrics.Unit("microseconds"),
vt: prometheus.GaugeValue, vt: prometheus.GaugeValue,
@@ -42,7 +42,7 @@ var cpuMetrics = []*metric{
}, },
}, },
{ {
name: "cpu_user_usage", name: "cpu_user_usec",
help: "Current cpu usage in user space (cgroup v2)", help: "Current cpu usage in user space (cgroup v2)",
unit: metrics.Unit("microseconds"), unit: metrics.Unit("microseconds"),
vt: prometheus.GaugeValue, vt: prometheus.GaugeValue,
@@ -58,7 +58,7 @@ var cpuMetrics = []*metric{
}, },
}, },
{ {
name: "cpu_system_usage", name: "cpu_system_usec",
help: "Current cpu usage in kernel space (cgroup v2)", help: "Current cpu usage in kernel space (cgroup v2)",
unit: metrics.Unit("microseconds"), unit: metrics.Unit("microseconds"),
vt: prometheus.GaugeValue, vt: prometheus.GaugeValue,

2
metrics/cgroups/v2/memory.go
View File

@@ -74,7 +74,7 @@ var memoryMetrics = []*metric{
}, },
}, },
{ {
name: "memory_swap_Limit", name: "memory_swap_limit",
help: "Current swap usage limit (cgroup v2)", help: "Current swap usage limit (cgroup v2)",
unit: metrics.Bytes, unit: metrics.Bytes,
vt: prometheus.GaugeValue, vt: prometheus.GaugeValue,