lapinot
/
cgroup_exporter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid null references during what appears to be race condition (#21)

This commit is contained in:
treydock 2022-11-15 08:50:15 -05:00 committed by GitHub
parent 9f99aa2e82
commit 7fe1ae6685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# Needs to be defined before including Makefile.common to auto-generate targets # Needs to be defined before including Makefile.common to auto-generate targets
DOCKER_ARCHS ?= amd64 arm64 ppc64le DOCKER_ARCHS ?= amd64 arm64 ppc64le
DOCKER_REPO ?= treydock DOCKER_REPO ?= treydock
GOLANGCI_LINT_VERSION ?= v1.44.2 GOLANGCI_LINT_VERSION ?= v1.50.1
include Makefile.common include Makefile.common

2
README.md
View File

@ -5,7 +5,7 @@
![GitHub All Releases](https://img.shields.io/github/downloads/treydock/cgroup_exporter/total) ![GitHub All Releases](https://img.shields.io/github/downloads/treydock/cgroup_exporter/total)
[![codecov](https://codecov.io/gh/treydock/cgroup_exporter/branch/master/graph/badge.svg)](https://codecov.io/gh/treydock/cgroup_exporter) [![codecov](https://codecov.io/gh/treydock/cgroup_exporter/branch/master/graph/badge.svg)](https://codecov.io/gh/treydock/cgroup_exporter)
# Check mount Prometheus exporter # cgroup Prometheus exporter
The `cgroup_exporter` produces metrics from cgroups. The `cgroup_exporter` produces metrics from cgroups.

32
cgroup_exporter.go
View File

@ -328,17 +328,27 @@ func (e *Exporter) getMetrics(name string, pids map[string][]int) (CgroupMetric,
return metric, err return metric, err
} }
stats, _ := ctrl.Stat(cgroups.IgnoreNotExist) stats, _ := ctrl.Stat(cgroups.IgnoreNotExist)
metric.cpuUser = float64(stats.CPU.Usage.User) / 1000000000.0 if stats.CPU != nil {
metric.cpuSystem = float64(stats.CPU.Usage.Kernel) / 1000000000.0 if stats.CPU.Usage != nil {
metric.cpuTotal = float64(stats.CPU.Usage.Total) / 1000000000.0 metric.cpuUser = float64(stats.CPU.Usage.User) / 1000000000.0
metric.memoryRSS = float64(stats.Memory.TotalRSS) metric.cpuSystem = float64(stats.CPU.Usage.Kernel) / 1000000000.0
metric.memoryCache = float64(stats.Memory.TotalCache) metric.cpuTotal = float64(stats.CPU.Usage.Total) / 1000000000.0
metric.memoryUsed = float64(stats.Memory.Usage.Usage) }
metric.memoryTotal = float64(stats.Memory.Usage.Limit) }
metric.memoryFailCount = float64(stats.Memory.Usage.Failcnt) if stats.Memory != nil {
metric.memswUsed = float64(stats.Memory.Swap.Usage) metric.memoryRSS = float64(stats.Memory.TotalRSS)
metric.memswTotal = float64(stats.Memory.Swap.Limit) metric.memoryCache = float64(stats.Memory.TotalCache)
metric.memswFailCount = float64(stats.Memory.Swap.Failcnt) if stats.Memory.Usage != nil {
metric.memoryUsed = float64(stats.Memory.Usage.Usage)
metric.memoryTotal = float64(stats.Memory.Usage.Limit)
metric.memoryFailCount = float64(stats.Memory.Usage.Failcnt)
}
if stats.Memory.Swap != nil {
metric.memswUsed = float64(stats.Memory.Swap.Usage)
metric.memswTotal = float64(stats.Memory.Swap.Limit)
metric.memswFailCount = float64(stats.Memory.Swap.Failcnt)
}
}
if cpus, err := getCPUs(name, e.logger); err == nil { if cpus, err := getCPUs(name, e.logger); err == nil {
metric.cpus = len(cpus) metric.cpus = len(cpus)
metric.cpu_list = strings.Join(cpus, ",") metric.cpu_list = strings.Join(cpus, ",")