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

bugfix: output of freq changed to MHz instead of GHz. removed exclude_metrics (only one metric anyway)

Browse Source
This commit is contained in:
brinkcoder 2025-03-05 00:50:26 +01:00
parent 6c6fdd8ae7
commit 2914f42356
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
collectors/cpufreqMetric.go
View File

@ -9,8 +9,8 @@ import (
"strings" "strings"
"time" "time"
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"
lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
"github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology" "github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
@ -29,13 +29,10 @@ type CPUFreqCollectorTopology struct {
type CPUFreqCollector struct { type CPUFreqCollector struct {
metricCollector metricCollector
topology []CPUFreqCollectorTopology topology []CPUFreqCollectorTopology
config struct { config struct{}
ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
}
} }
func (m *CPUFreqCollector) Init(config json.RawMessage) error { func (m *CPUFreqCollector) Init(config json.RawMessage) error {
// Check if already initialized
if m.init { if m.init {
return nil return nil
} }
@ -43,27 +40,19 @@ func (m *CPUFreqCollector) Init(config json.RawMessage) error {
m.name = "CPUFreqCollector" m.name = "CPUFreqCollector"
m.setup() m.setup()
m.parallel = true m.parallel = true
if len(config) > 0 {
err := json.Unmarshal(config, &m.config)
if err != nil {
return err
}
}
m.meta = map[string]string{ m.meta = map[string]string{
"source": m.name, "source": m.name,
"group": "CPU", "group": "CPU",
"unit": "Hz", "unit": "MHz",
} }
m.topology = make([]CPUFreqCollectorTopology, 0) m.topology = make([]CPUFreqCollectorTopology, 0)
for _, c := range ccTopology.CpuData() { for _, c := range ccTopology.CpuData() {
// Only measure on the first hyper-thread
// Skip hyper threading CPUs
if c.CpuID != c.CoreCPUsList[0] { if c.CpuID != c.CoreCPUsList[0] {
continue continue
} }
// Check access to current frequency file
scalingCurFreqFile := filepath.Join("/sys/devices/system/cpu", fmt.Sprintf("cpu%d", c.CpuID), "cpufreq/scaling_cur_freq") scalingCurFreqFile := filepath.Join("/sys/devices/system/cpu", fmt.Sprintf("cpu%d", c.CpuID), "cpufreq/scaling_cur_freq")
err := unix.Access(scalingCurFreqFile, unix.R_OK) err := unix.Access(scalingCurFreqFile, unix.R_OK)
if err != nil { if err != nil {
@ -82,7 +71,6 @@ func (m *CPUFreqCollector) Init(config json.RawMessage) error {
) )
} }
// Initialized
cclog.ComponentDebug( cclog.ComponentDebug(
m.name, m.name,
"initialized", "initialized",
@ -92,7 +80,6 @@ func (m *CPUFreqCollector) Init(config json.RawMessage) error {
} }
func (m *CPUFreqCollector) Read(interval time.Duration, output chan lp.CCMessage) { func (m *CPUFreqCollector) Read(interval time.Duration, output chan lp.CCMessage) {
// Check if already initialized
if !m.init { if !m.init {
return return
} }
@ -101,7 +88,6 @@ func (m *CPUFreqCollector) Read(interval time.Duration, output chan lp.CCMessage
for i := range m.topology { for i := range m.topology {
t := &m.topology[i] t := &m.topology[i]
// Read current frequency
line, err := os.ReadFile(t.scalingCurFreqFile) line, err := os.ReadFile(t.scalingCurFreqFile)
if err != nil { if err != nil {
cclog.ComponentError( cclog.ComponentError(
@ -109,7 +95,7 @@ func (m *CPUFreqCollector) Read(interval time.Duration, output chan lp.CCMessage
fmt.Sprintf("Read(): Failed to read file '%s': %v", t.scalingCurFreqFile, err)) fmt.Sprintf("Read(): Failed to read file '%s': %v", t.scalingCurFreqFile, err))
continue continue
} }
cpuFreq, err := strconv.ParseInt(strings.TrimSpace(string(line)), 10, 64) cpuFreqKHz, err := strconv.ParseInt(strings.TrimSpace(string(line)), 10, 64)
if err != nil { if err != nil {
cclog.ComponentError( cclog.ComponentError(
m.name, m.name,
@ -117,7 +103,9 @@ func (m *CPUFreqCollector) Read(interval time.Duration, output chan lp.CCMessage
continue continue
} }
if y, err := lp.NewMessage("cpufreq", t.tagSet, m.meta, map[string]interface{}{"value": cpuFreq}, now); err == nil { cpuFreqMHz := cpuFreqKHz / 1000
if y, err := lp.NewMessage("cpufreq", t.tagSet, m.meta, map[string]interface{}{"value": cpuFreqMHz}, now); err == nil {
output <- y output <- y
} }
} }

12
collectors/cpufreqMetric.md
View File

@ -1,13 +1,11 @@
## `cpufreq_cpuinfo` collector ## `cpufreq` collector
```json ```json
"cpufreq": { "cpufreq": {}
"exclude_metrics": []
}
``` ```
The `cpufreq` collector reads the clock frequency from `/sys/devices/system/cpu/cpu*/cpufreq` and outputs a handful **hwthread** metrics. The `cpufreq` collector reads the clock frequency from `/sys/devices/system/cpu/cpu*/cpufreq` and outputs `cpufreq` as a **hwthread** metric.
Metrics: Metric:
* `cpufreq` - `cpufreq`