mirror of
https://github.com/ClusterCockpit/cc-metric-collector.git
synced 2024-12-26 15:29:04 +01:00
3f76947f54
* Update configuration.md Add an additional receiver to have better alignment of components * Change default GpfsCollector command to `mmpmon` (#53) * Set default cmd to 'mmpmon' * Reuse looked up path * Cast const to string * Just download LIKWID to get the headers (#54) * Just download LIKWID to get the headers * Remove perl-Data-Dumper from BuildRequires, only required by LIKWID build * Add HttpReceiver as counterpart to the HttpSink (#49) * Use GBytes as unit for large memory numbers * Make maxForward configurable, save old name in meta in rename metrics and make the hostname tag key configurable * Single release action (#55) Building all RPMs and releasing in a single workflow * Makefile target to build binary-only Debian packages (#61) * Add 'install' and 'DEB' make targets to build binary-only Debian packages * Add control file for DEB builds * Use a single line for bash loop in make clean * Add config options for retry intervals of InfluxDB clients (#59) * Refactoring of LikwidCollector and metric units (#62) * Reduce complexity of LikwidCollector and allow metric units * Add unit to LikwidCollector docu and fix some typos * Make library path configurable * Use old metric name in Ganglia if rename has happened in the router (#60) * Use old metric name if rename has happened in the router * Also check for Ganglia renames for the oldname * Derived metrics (#57) * Add time-based derivatived (e.g. bandwidth) to some collectors * Add documentation * Add comments * Fix: Only compute rates with a valid previous state * Only compute rates with a valid previous state * Define const values for net/dev fields * Set default config values * Add comments * Refactor: Consolidate data structures * Refactor: Consolidate data structures * Refactor: Avoid struct deep copy * Refactor: Avoid redundant tag maps * Refactor: Use int64 type for absolut values Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> * Simplified iota usage * Move unit tag to meta data tags * Derived metrics (#65) * Add time-based derivatived (e.g. bandwidth) to some collectors * Add documentation * Add comments * Fix: Only compute rates with a valid previous state * Only compute rates with a valid previous state * Define const values for net/dev fields * Set default config values * Add comments * Refactor: Consolidate data structures * Refactor: Consolidate data structures * Refactor: Avoid struct deep copy * Refactor: Avoid redundant tag maps * Refactor: Use int64 type for absolut values * Update LustreCollector Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> * Meta to tags list and map for sinks (#63) * Change ccMetric->Influx functions * Use a meta_as_tags string list in config but create a lookup map afterwards * Add meta as tag logic to sampleSink * Fix staticcheck warnings (#66) Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
211 lines
5.3 KiB
Go
211 lines
5.3 KiB
Go
package collectors
|
|
|
|
import (
|
|
"bufio"
|
|
"encoding/json"
|
|
|
|
"fmt"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
|
|
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
|
|
)
|
|
|
|
//
|
|
// CPUFreqCollector
|
|
// 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 {
|
|
processor string // logical processor number (continuous, starting at 0)
|
|
coreID string // socket local core ID
|
|
coreID_int int64
|
|
physicalPackageID string // socket / package ID
|
|
physicalPackageID_int int64
|
|
numPhysicalPackages string // number of sockets / packages
|
|
numPhysicalPackages_int int64
|
|
isHT bool
|
|
numNonHT string // number of non hyperthreading processors
|
|
numNonHT_int int64
|
|
tagSet map[string]string
|
|
}
|
|
|
|
type CPUFreqCpuInfoCollector struct {
|
|
metricCollector
|
|
topology []*CPUFreqCpuInfoCollectorTopology
|
|
}
|
|
|
|
func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
|
|
// Check if already initialized
|
|
if m.init {
|
|
return nil
|
|
}
|
|
|
|
m.setup()
|
|
|
|
m.name = "CPUFreqCpuInfoCollector"
|
|
m.meta = map[string]string{
|
|
"source": m.name,
|
|
"group": "CPU",
|
|
"unit": "MHz",
|
|
}
|
|
|
|
const cpuInfoFile = "/proc/cpuinfo"
|
|
file, err := os.Open(cpuInfoFile)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to open file '%s': %v", cpuInfoFile, err)
|
|
}
|
|
defer file.Close()
|
|
|
|
// Collect topology information from file cpuinfo
|
|
foundFreq := false
|
|
processor := ""
|
|
var numNonHT_int int64 = 0
|
|
coreID := ""
|
|
physicalPackageID := ""
|
|
var maxPhysicalPackageID int64 = 0
|
|
m.topology = make([]*CPUFreqCpuInfoCollectorTopology, 0)
|
|
coreSeenBefore := make(map[string]bool)
|
|
|
|
// Read cpuinfo file, line by line
|
|
scanner := bufio.NewScanner(file)
|
|
for scanner.Scan() {
|
|
lineSplit := strings.Split(scanner.Text(), ":")
|
|
if len(lineSplit) == 2 {
|
|
key := strings.TrimSpace(lineSplit[0])
|
|
value := strings.TrimSpace(lineSplit[1])
|
|
switch key {
|
|
case "cpu MHz":
|
|
// frequency
|
|
foundFreq = true
|
|
case "processor":
|
|
processor = value
|
|
case "core id":
|
|
coreID = value
|
|
case "physical id":
|
|
physicalPackageID = value
|
|
}
|
|
}
|
|
|
|
// were all topology information collected?
|
|
if foundFreq &&
|
|
len(processor) > 0 &&
|
|
len(coreID) > 0 &&
|
|
len(physicalPackageID) > 0 {
|
|
|
|
topology := new(CPUFreqCpuInfoCollectorTopology)
|
|
|
|
// Processor
|
|
topology.processor = processor
|
|
|
|
// Core ID
|
|
topology.coreID = coreID
|
|
topology.coreID_int, err = strconv.ParseInt(coreID, 10, 64)
|
|
if err != nil {
|
|
return fmt.Errorf("unable to convert coreID '%s' to int64: %v", coreID, err)
|
|
}
|
|
|
|
// Physical package ID
|
|
topology.physicalPackageID = physicalPackageID
|
|
topology.physicalPackageID_int, err = strconv.ParseInt(physicalPackageID, 10, 64)
|
|
if err != nil {
|
|
return fmt.Errorf("unable to convert physicalPackageID '%s' to int64: %v", physicalPackageID, err)
|
|
}
|
|
|
|
// increase maximun socket / package ID, when required
|
|
if topology.physicalPackageID_int > maxPhysicalPackageID {
|
|
maxPhysicalPackageID = topology.physicalPackageID_int
|
|
}
|
|
|
|
// is hyperthread?
|
|
globalID := physicalPackageID + ":" + coreID
|
|
topology.isHT = coreSeenBefore[globalID]
|
|
coreSeenBefore[globalID] = true
|
|
if !topology.isHT {
|
|
// increase number on non hyper thread cores
|
|
numNonHT_int++
|
|
}
|
|
|
|
// store collected topology information
|
|
m.topology = append(m.topology, topology)
|
|
|
|
// reset topology information
|
|
foundFreq = false
|
|
processor = ""
|
|
coreID = ""
|
|
physicalPackageID = ""
|
|
}
|
|
}
|
|
|
|
numPhysicalPackageID_int := maxPhysicalPackageID + 1
|
|
numPhysicalPackageID := fmt.Sprint(numPhysicalPackageID_int)
|
|
numNonHT := fmt.Sprint(numNonHT_int)
|
|
for _, t := range m.topology {
|
|
t.numPhysicalPackages = numPhysicalPackageID
|
|
t.numPhysicalPackages_int = numPhysicalPackageID_int
|
|
t.numNonHT = numNonHT
|
|
t.numNonHT_int = numNonHT_int
|
|
t.tagSet = map[string]string{
|
|
"type": "cpu",
|
|
"type-id": t.processor,
|
|
"package_id": t.physicalPackageID,
|
|
}
|
|
}
|
|
|
|
m.init = true
|
|
return nil
|
|
}
|
|
|
|
func (m *CPUFreqCpuInfoCollector) Read(interval time.Duration, output chan lp.CCMetric) {
|
|
// Check if already initialized
|
|
if !m.init {
|
|
return
|
|
}
|
|
|
|
const cpuInfoFile = "/proc/cpuinfo"
|
|
file, err := os.Open(cpuInfoFile)
|
|
if err != nil {
|
|
cclog.ComponentError(
|
|
m.name,
|
|
fmt.Sprintf("Read(): Failed to open file '%s': %v", cpuInfoFile, err))
|
|
return
|
|
}
|
|
defer file.Close()
|
|
|
|
processorCounter := 0
|
|
now := time.Now()
|
|
scanner := bufio.NewScanner(file)
|
|
for scanner.Scan() {
|
|
lineSplit := strings.Split(scanner.Text(), ":")
|
|
if len(lineSplit) == 2 {
|
|
key := strings.TrimSpace(lineSplit[0])
|
|
|
|
// frequency
|
|
if key == "cpu MHz" {
|
|
t := m.topology[processorCounter]
|
|
if !t.isHT {
|
|
value, err := strconv.ParseFloat(strings.TrimSpace(lineSplit[1]), 64)
|
|
if err != nil {
|
|
cclog.ComponentError(
|
|
m.name,
|
|
fmt.Sprintf("Read(): Failed to convert cpu MHz '%s' to float64: %v", lineSplit[1], err))
|
|
return
|
|
}
|
|
if y, err := lp.New("cpufreq", t.tagSet, m.meta, map[string]interface{}{"value": value}, now); err == nil {
|
|
output <- y
|
|
}
|
|
}
|
|
processorCounter++
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (m *CPUFreqCpuInfoCollector) Close() {
|
|
m.init = false
|
|
}
|