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

Units fix

Browse Source 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
This commit is contained in:
Boris Popovschi 2019-12-16 19:54:21 +02:00
parent f287bc2292
commit 17d61d6b7e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ var cpuMetrics = []*metric{
{ {
name: "cpu_usage", name: "cpu_usage",
help: "Total cpu usage (cgroup v2)", help: "Total cpu usage (cgroup v2)",
unit: metrics.Nanoseconds, unit: metrics.Unit("microseconds"),
vt: prometheus.GaugeValue, vt: prometheus.GaugeValue,
getValues: func(stats *v2.Metrics) []value { getValues: func(stats *v2.Metrics) []value {
if stats.CPU == nil { if stats.CPU == nil {
@ -44,7 +44,7 @@ var cpuMetrics = []*metric{
{ {
name: "cpu_user_usage", name: "cpu_user_usage",
help: "Current cpu usage in user space (cgroup v2)", help: "Current cpu usage in user space (cgroup v2)",
unit: metrics.Nanoseconds, unit: metrics.Unit("microseconds"),
vt: prometheus.GaugeValue, vt: prometheus.GaugeValue,
getValues: func(stats *v2.Metrics) []value { getValues: func(stats *v2.Metrics) []value {
if stats.CPU == nil { if stats.CPU == nil {
@ -60,7 +60,7 @@ var cpuMetrics = []*metric{
{ {
name: "cpu_kernel_usage", name: "cpu_kernel_usage",
help: "Current cpu usage in kernel space (cgroup v2)", help: "Current cpu usage in kernel space (cgroup v2)",
unit: metrics.Nanoseconds, unit: metrics.Unit("microseconds"),
vt: prometheus.GaugeValue, vt: prometheus.GaugeValue,
getValues: func(stats *v2.Metrics) []value { getValues: func(stats *v2.Metrics) []value {
if stats.CPU == nil { if stats.CPU == nil {
@ -108,7 +108,7 @@ var cpuMetrics = []*metric{
{ {
name: "cpu_throttled_usec", name: "cpu_throttled_usec",
help: "Total time duration for which tasks have been throttled. (only if controller is enabled)", help: "Total time duration for which tasks have been throttled. (only if controller is enabled)",
unit: metrics.Nanoseconds, unit: metrics.Unit("microseconds"),
vt: prometheus.GaugeValue, vt: prometheus.GaugeValue,
getValues: func(stats *v2.Metrics) []value { getValues: func(stats *v2.Metrics) []value {
if stats.CPU == nil { if stats.CPU == nil {

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

@ -139,8 +139,8 @@ var memoryMetrics = []*metric{
}, },
}, },
{ {
name: "memory_pgactive", name: "memory_pgactivate",
help: "The pgactive amount", help: "The pgactivate amount",
unit: metrics.Bytes, unit: metrics.Bytes,
vt: prometheus.GaugeValue, vt: prometheus.GaugeValue,
getValues: func(stats *v2.Metrics) []value { getValues: func(stats *v2.Metrics) []value {