ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-04-05 21:25:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

small changes

Browse Source
This commit is contained in:
brinkcoder 2025-03-05 00:48:23 +01:00
parent 76e36373f1
commit 6c6fdd8ae7
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
collectors/cpufreqCpuinfoMetric.go
View File

@ -3,26 +3,25 @@ package collectors
import ( import (
"bufio" "bufio"
"encoding/json" "encoding/json"
"fmt" "fmt"
"os" "os"
"strconv" "strconv"
"strings" "strings"
"time" "time"
lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message" lp "github.com/ClusterCockpit/cc-lib/ccMessage"
cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
) )
// CPUFreqCollector // CPUFreqCpuInfoCollectorTopology holds topology information for each CPU.
// a metric collector to measure the current frequency of the CPUs
// as obtained from /proc/cpuinfo
// Only measure on the first hyperthread
type CPUFreqCpuInfoCollectorTopology struct { type CPUFreqCpuInfoCollectorTopology struct {
isHT bool isHT bool
tagSet map[string]string tagSet map[string]string
} }
// CPUFreqCpuInfoCollector is a metric collector to measure the current frequency of the CPUs
// as obtained from /proc/cpuinfo.
// Only measure on the first hyperthread.
type CPUFreqCpuInfoCollector struct { type CPUFreqCpuInfoCollector struct {
metricCollector metricCollector
topology []CPUFreqCpuInfoCollectorTopology topology []CPUFreqCpuInfoCollectorTopology
@ -51,7 +50,7 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
} }
defer file.Close() defer file.Close()
// Collect topology information from file cpuinfo // Collect topology information from /proc/cpuinfo
foundFreq := false foundFreq := false
processor := "" processor := ""
coreID := "" coreID := ""
@ -59,7 +58,7 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
m.topology = make([]CPUFreqCpuInfoCollectorTopology, 0) m.topology = make([]CPUFreqCpuInfoCollectorTopology, 0)
coreSeenBefore := make(map[string]bool) coreSeenBefore := make(map[string]bool)
// Read cpuinfo file, line by line // Read the cpuinfo file, line by line
scanner := bufio.NewScanner(file) scanner := bufio.NewScanner(file)
for scanner.Scan() { for scanner.Scan() {
lineSplit := strings.Split(scanner.Text(), ":") lineSplit := strings.Split(scanner.Text(), ":")
@ -68,7 +67,7 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
value := strings.TrimSpace(lineSplit[1]) value := strings.TrimSpace(lineSplit[1])
switch key { switch key {
case "cpu MHz": case "cpu MHz":
// frequency // frequency detected
foundFreq = true foundFreq = true
case "processor": case "processor":
processor = value processor = value
@ -79,7 +78,7 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
} }
} }
// were all topology information collected? // Have all topology information been collected?
if foundFreq && if foundFreq &&
len(processor) > 0 && len(processor) > 0 &&
len(coreID) > 0 && len(coreID) > 0 &&
@ -87,7 +86,7 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
globalID := physicalPackageID + ":" + coreID globalID := physicalPackageID + ":" + coreID
// store collected topology information // Store collected topology information
m.topology = append(m.topology, m.topology = append(m.topology,
CPUFreqCpuInfoCollectorTopology{ CPUFreqCpuInfoCollectorTopology{
isHT: coreSeenBefore[globalID], isHT: coreSeenBefore[globalID],
@ -99,10 +98,10 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
}, },
) )
// mark core as seen before // Mark core as seen before
coreSeenBefore[globalID] = true coreSeenBefore[globalID] = true
// reset topology information // Reset topology information for the next CPU
foundFreq = false foundFreq = false
processor = "" processor = ""
coreID = "" coreID = ""
@ -142,7 +141,6 @@ func (m *CPUFreqCpuInfoCollector) Read(interval time.Duration, output chan lp.CC
lineSplit := strings.Split(scanner.Text(), ":") lineSplit := strings.Split(scanner.Text(), ":")
if len(lineSplit) == 2 { if len(lineSplit) == 2 {
key := strings.TrimSpace(lineSplit[0]) key := strings.TrimSpace(lineSplit[0])
// frequency // frequency
if key == "cpu MHz" { if key == "cpu MHz" {
t := m.topology[processorCounter] t := m.topology[processorCounter]

6
collectors/cpufreqCpuinfoMetric.md
View File

@ -4,8 +4,8 @@
"cpufreq_cpuinfo": {} "cpufreq_cpuinfo": {}
``` ```
The `cpufreq_cpuinfo` collector reads the clock frequency from `/proc/cpuinfo` and outputs a handful **hwthread** metrics. The `cpufreq_cpuinfo` collector reads the clock frequency from `/proc/cpuinfo` and outputs `cpufreq` as a **hwthread** metric.
Metrics: Metric:
* `cpufreq` - `cpufreq`