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

Merge pull request #8535 from cardyok/metrics_enrich_memory_cgroups

Browse Source 
bugfix: add nil pointer check for cgroup v1 mem usage
This commit is contained in:
Fu Wei
2023-06-01 13:07:17 +08:00
committed by GitHub
parent 73645b1dfe a35ead5b9d
commit 83371c4bef
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
metrics/cgroups/v1/memory.go
View File

@@ -543,7 +543,7 @@ var memoryMetrics = []*metric{
unit: metrics.Total,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetUsage() == nil {
return nil
}
return []value{
@@ -559,7 +559,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetUsage() == nil {
return nil
}
return []value{
@@ -575,7 +575,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetUsage() == nil {
return nil
}
return []value{
@@ -591,7 +591,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetUsage() == nil {
return nil
}
return []value{
@@ -607,7 +607,7 @@ var memoryMetrics = []*metric{
unit: metrics.Total,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetSwap() == nil {
return nil
}
return []value{
@@ -623,7 +623,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetSwap() == nil {
return nil
}
return []value{
@@ -639,7 +639,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetSwap() == nil {
return nil
}
return []value{
@@ -655,7 +655,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetSwap() == nil {
return nil
}
return []value{
@@ -671,7 +671,7 @@ var memoryMetrics = []*metric{
unit: metrics.Total,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetKernel() == nil {
return nil
}
return []value{
@@ -687,7 +687,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetKernel() == nil {
return nil
}
return []value{
@@ -703,7 +703,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetKernel() == nil {
return nil
}
return []value{
@@ -719,7 +719,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetKernel() == nil {
return nil
}
return []value{
@@ -735,7 +735,7 @@ var memoryMetrics = []*metric{
unit: metrics.Total,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetKernelTCP() == nil {
return nil
}
return []value{
@@ -751,7 +751,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetKernelTCP() == nil {
return nil
}
return []value{
@@ -767,7 +767,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetKernelTCP() == nil {
return nil
}
return []value{
@@ -783,7 +783,7 @@ var memoryMetrics = []*metric{
unit: metrics.Bytes,
vt: prometheus.GaugeValue,
getValues: func(stats *v1.Metrics) []value {
if stats.Memory == nil {
if stats.GetMemory().GetKernelTCP() == nil {
return nil
}
return []value{