Skip to content

Commit

Permalink
report core throttles for each CPU
Browse files Browse the repository at this point in the history 
It's possible for two cpus in the same core to have a different
value for the core_throttle_count, so this change reports a
cpu_core_throttles metric for each cpu and not just each core.
Hyperthreading systems have two cpus per core.

Fixes prometheus#1472

Signed-off-by: Paul Gier <[email protected]>
  • Loading branch information
@pgier
pgier committed Sep 10, 2019
1 parent 7caedcc commit ab8fb46
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 39 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

### Changes

* [CHANGE] Report cpu_core_throttles for all CPUs. Add label "cpu". #1479
* [CHANGE] Add `--collector.netdev.device-whitelist`. #1279
* [CHANGE] Refactor mdadm collector #1403
* [CHANGE] Add `mountaddr` label to NFS metrics. #1417
Expand Down
46 changes: 17 additions & 29 deletions collector/cpu_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"fmt"
"path/filepath"
"strconv"
"strings"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
Expand Down Expand Up @@ -53,8 +54,8 @@ func NewCPUCollector() (Collector, error) {
),
cpuCoreThrottle: prometheus.NewDesc(
prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "core_throttles_total"),
"Number of times this cpu core has been throttled.",
[]string{"package", "core"}, nil,
"Number of times this cpu has been throttled.",
[]string{"package", "core", "cpu"}, nil,
),
cpuPackageThrottle: prometheus.NewDesc(
prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "package_throttles_total"),
Expand Down Expand Up @@ -83,7 +84,6 @@ func (c *cpuCollector) updateThermalThrottle(ch chan<- prometheus.Metric) error
}

packageThrottles := make(map[uint64]uint64)
packageCoreThrottles := make(map[uint64]map[uint64]uint64)

// cpu loop
for _, cpu := range cpus {
Expand Down Expand Up @@ -111,45 +111,33 @@ func (c *cpuCollector) updateThermalThrottle(ch chan<- prometheus.Metric) error
// are cpu+kernel combinations that only present core throttles
// but no package throttles.
// Seen e.g. on an Intel Xeon E5472 system with RHEL 6.9 kernel.
if _, present := packageCoreThrottles[physicalPackageID]; !present {
packageCoreThrottles[physicalPackageID] = make(map[uint64]uint64)
}
if _, present := packageCoreThrottles[physicalPackageID][coreID]; !present {
// Read thermal_throttle/core_throttle_count only once
if coreThrottleCount, err := readUintFromFile(filepath.Join(cpu, "thermal_throttle", "core_throttle_count")); err == nil {
packageCoreThrottles[physicalPackageID][coreID] = coreThrottleCount
} else {
log.Debugf("CPU %v is missing core_throttle_count", cpu)
}
if coreThrottleCount, err := readUintFromFile(filepath.Join(cpu, "thermal_throttle", "core_throttle_count")); err == nil {
ch <- prometheus.MustNewConstMetric(c.cpuCoreThrottle,
prometheus.CounterValue,
float64(coreThrottleCount),
strconv.FormatUint(physicalPackageID, 10),
strconv.FormatUint(coreID, 10),
strings.TrimPrefix(filepath.Base(cpu), "cpu"))
} else {
log.Debugf("CPU %v is missing core_throttle_count", cpu)
}

// metric node_cpu_package_throttles_total
// All CPUs in the same package have the same value for package_throttles, so we only need one metric per package
if _, present := packageThrottles[physicalPackageID]; !present {
// Read thermal_throttle/package_throttle_count only once
if packageThrottleCount, err := readUintFromFile(filepath.Join(cpu, "thermal_throttle", "package_throttle_count")); err == nil {
packageThrottles[physicalPackageID] = packageThrottleCount
ch <- prometheus.MustNewConstMetric(c.cpuPackageThrottle,
prometheus.CounterValue,
float64(packageThrottleCount),
strconv.FormatUint(physicalPackageID, 10))
} else {
log.Debugf("CPU %v is missing package_throttle_count", cpu)
}
}
}

for physicalPackageID, packageThrottleCount := range packageThrottles {
ch <- prometheus.MustNewConstMetric(c.cpuPackageThrottle,
prometheus.CounterValue,
float64(packageThrottleCount),
strconv.FormatUint(physicalPackageID, 10))
}

for physicalPackageID, coreMap := range packageCoreThrottles {
for coreID, coreThrottleCount := range coreMap {
ch <- prometheus.MustNewConstMetric(c.cpuCoreThrottle,
prometheus.CounterValue,
float64(coreThrottleCount),
strconv.FormatUint(physicalPackageID, 10),
strconv.FormatUint(coreID, 10))
}
}
return nil
}

Expand Down
10 changes: 5 additions & 5 deletions collector/fixtures/e2e-64k-page-output.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,12 @@ node_cooling_device_cur_state{name="0",type="Processor"} 0
# HELP node_cooling_device_max_state Maximum throttle state of the cooling device
# TYPE node_cooling_device_max_state gauge
node_cooling_device_max_state{name="0",type="Processor"} 3
# HELP node_cpu_core_throttles_total Number of times this cpu core has been throttled.
# HELP node_cpu_core_throttles_total Number of times this cpu has been throttled.
# TYPE node_cpu_core_throttles_total counter
node_cpu_core_throttles_total{core="0",package="0"} 5
node_cpu_core_throttles_total{core="0",package="1"} 0
node_cpu_core_throttles_total{core="1",package="0"} 0
node_cpu_core_throttles_total{core="1",package="1"} 9
node_cpu_core_throttles_total{core="0",cpu="0",package="0"} 5
node_cpu_core_throttles_total{core="0",cpu="2",package="1"} 0
node_cpu_core_throttles_total{core="1",cpu="1",package="0"} 0
node_cpu_core_throttles_total{core="1",cpu="3",package="1"} 9
# HELP node_cpu_guest_seconds_total Seconds the cpus spent in guests (VMs) for each mode.
# TYPE node_cpu_guest_seconds_total counter
node_cpu_guest_seconds_total{cpu="0",mode="nice"} 0.01
Expand Down
10 changes: 5 additions & 5 deletions collector/fixtures/e2e-output.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,12 @@ node_cooling_device_cur_state{name="0",type="Processor"} 0
# HELP node_cooling_device_max_state Maximum throttle state of the cooling device
# TYPE node_cooling_device_max_state gauge
node_cooling_device_max_state{name="0",type="Processor"} 3
# HELP node_cpu_core_throttles_total Number of times this cpu core has been throttled.
# HELP node_cpu_core_throttles_total Number of times this cpu has been throttled.
# TYPE node_cpu_core_throttles_total counter
node_cpu_core_throttles_total{core="0",package="0"} 5
node_cpu_core_throttles_total{core="0",package="1"} 0
node_cpu_core_throttles_total{core="1",package="0"} 0
node_cpu_core_throttles_total{core="1",package="1"} 9
node_cpu_core_throttles_total{core="0",cpu="0",package="0"} 5
node_cpu_core_throttles_total{core="0",cpu="2",package="1"} 0
node_cpu_core_throttles_total{core="1",cpu="1",package="0"} 0
node_cpu_core_throttles_total{core="1",cpu="3",package="1"} 9
# HELP node_cpu_guest_seconds_total Seconds the cpus spent in guests (VMs) for each mode.
# TYPE node_cpu_guest_seconds_total counter
node_cpu_guest_seconds_total{cpu="0",mode="nice"} 0.01
Expand Down

0 comments on commit ab8fb46

Please sign in to comment.