mirror of
https://github.com/ClusterCockpit/cc-metric-collector.git
synced 2024-12-25 23:19:06 +01:00
7840de7b82
* Add cpu_used (all-cpu_idle) to CpustatCollector * Update cc-metric-collector.init * Allow selection of timestamp precision in HttpSink * Add comment about precision requirement for cc-metric-store * Fix for API changes in gofish@v0.15.0 * Update requirements to latest version * Read sensors through redfish * Update golang toolchain to 1.21 * Remove stray error check * Update main config in configuration.md * Update Release action to use golang 1.22 stable release, no golang RPMs anymore * Update runonce action to use golang 1.22 stable release, no golang RPMs anymore * Update README.md Use right JSON type in configuration * Update sink's README * Test whether ipmitool or ipmi-sensors can be executed without errors * Little fixes to the prometheus sink (#115) * Add uint64 to float64 cast option * Add prometheus sink to the list of available sinks * Add aggregated counters by gpu for nvlink errors --------- Co-authored-by: Michael Schwarz <schwarz@uni-paderborn.de> * Ccmessage migration (#119) * Add cpu_used (all-cpu_idle) to CpustatCollector * Update cc-metric-collector.init * Allow selection of timestamp precision in HttpSink * Add comment about precision requirement for cc-metric-store * Fix for API changes in gofish@v0.15.0 * Update requirements to latest version * Read sensors through redfish * Update golang toolchain to 1.21 * Remove stray error check * Update main config in configuration.md * Update Release action to use golang 1.22 stable release, no golang RPMs anymore * Update runonce action to use golang 1.22 stable release, no golang RPMs anymore * Switch to CCMessage for all files. --------- Co-authored-by: Holger Obermaier <Holger.Obermaier@kit.edu> Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> * Switch to ccmessage also for latest additions in nvidiaMetric * New Message processor (#118) * Add cpu_used (all-cpu_idle) to CpustatCollector * Update cc-metric-collector.init * Allow selection of timestamp precision in HttpSink * Add comment about precision requirement for cc-metric-store * Fix for API changes in gofish@v0.15.0 * Update requirements to latest version * Read sensors through redfish * Update golang toolchain to 1.21 * Remove stray error check * Update main config in configuration.md * Update Release action to use golang 1.22 stable release, no golang RPMs anymore * Update runonce action to use golang 1.22 stable release, no golang RPMs anymore * New message processor to check whether a message should be dropped or manipulate it in flight * Create a copy of message before manipulation --------- Co-authored-by: Holger Obermaier <Holger.Obermaier@kit.edu> Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> * Update collector's Makefile and go.mod/sum files * Use message processor in router, all sinks and all receivers * Add support for credential file (NKEY) to NATS sink and receiver * Fix JSON keys in message processor configuration * Update docs for message processor, router and the default router config file * Add link to expr syntax and fix regex matching docs * Update sample collectors * Minor style change in collector manager * Some helpers for ccTopology * LIKWID collector: write log owner change only once * Fix for metrics without units and reduce debugging messages for messageProcessor * Use shorted hostname for hostname added by router * Define default port for NATS * CPUstat collector: only add unit for applicable metrics * Add precision option to all sinks using Influx's encoder * Add message processor to all sink documentation * Add units to documentation of cpustat collector --------- Co-authored-by: Holger Obermaier <Holger.Obermaier@kit.edu> Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> Co-authored-by: oscarminus <me@oscarminus.de> Co-authored-by: Michael Schwarz <schwarz@uni-paderborn.de>
152 lines
3.2 KiB
Go
152 lines
3.2 KiB
Go
package collectors
|
|
|
|
import (
|
|
"bufio"
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
|
|
lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
|
|
)
|
|
|
|
// Non-Uniform Memory Access (NUMA) policy hit/miss statistics
|
|
//
|
|
// numa_hit:
|
|
//
|
|
// A process wanted to allocate memory from this node, and succeeded.
|
|
//
|
|
// numa_miss:
|
|
//
|
|
// A process wanted to allocate memory from another node,
|
|
// but ended up with memory from this node.
|
|
//
|
|
// numa_foreign:
|
|
//
|
|
// A process wanted to allocate on this node,
|
|
// but ended up with memory from another node.
|
|
//
|
|
// local_node:
|
|
//
|
|
// A process ran on this node's CPU,
|
|
// and got memory from this node.
|
|
//
|
|
// other_node:
|
|
//
|
|
// A process ran on a different node's CPU
|
|
// and got memory from this node.
|
|
//
|
|
// interleave_hit:
|
|
//
|
|
// Interleaving wanted to allocate from this node
|
|
// and succeeded.
|
|
//
|
|
// See: https://www.kernel.org/doc/html/latest/admin-guide/numastat.html
|
|
type NUMAStatsCollectorTopolgy struct {
|
|
file string
|
|
tagSet map[string]string
|
|
}
|
|
|
|
type NUMAStatsCollector struct {
|
|
metricCollector
|
|
topology []NUMAStatsCollectorTopolgy
|
|
}
|
|
|
|
func (m *NUMAStatsCollector) Init(config json.RawMessage) error {
|
|
// Check if already initialized
|
|
if m.init {
|
|
return nil
|
|
}
|
|
|
|
m.name = "NUMAStatsCollector"
|
|
m.parallel = true
|
|
m.setup()
|
|
m.meta = map[string]string{
|
|
"source": m.name,
|
|
"group": "NUMA",
|
|
}
|
|
|
|
// Loop for all NUMA node directories
|
|
base := "/sys/devices/system/node/node"
|
|
globPattern := base + "[0-9]*"
|
|
dirs, err := filepath.Glob(globPattern)
|
|
if err != nil {
|
|
return fmt.Errorf("unable to glob files with pattern '%s'", globPattern)
|
|
}
|
|
if dirs == nil {
|
|
return fmt.Errorf("unable to find any files with pattern '%s'", globPattern)
|
|
}
|
|
m.topology = make([]NUMAStatsCollectorTopolgy, 0, len(dirs))
|
|
for _, dir := range dirs {
|
|
node := strings.TrimPrefix(dir, base)
|
|
file := filepath.Join(dir, "numastat")
|
|
m.topology = append(m.topology,
|
|
NUMAStatsCollectorTopolgy{
|
|
file: file,
|
|
tagSet: map[string]string{"memoryDomain": node},
|
|
})
|
|
}
|
|
|
|
// Initialized
|
|
cclog.ComponentDebug(m.name, "initialized", len(m.topology), "NUMA domains")
|
|
m.init = true
|
|
return nil
|
|
}
|
|
|
|
func (m *NUMAStatsCollector) Read(interval time.Duration, output chan lp.CCMessage) {
|
|
if !m.init {
|
|
return
|
|
}
|
|
|
|
for i := range m.topology {
|
|
// Loop for all NUMA domains
|
|
t := &m.topology[i]
|
|
|
|
now := time.Now()
|
|
file, err := os.Open(t.file)
|
|
if err != nil {
|
|
cclog.ComponentError(
|
|
m.name,
|
|
fmt.Sprintf("Read(): Failed to open file '%s': %v", t.file, err))
|
|
return
|
|
}
|
|
scanner := bufio.NewScanner(file)
|
|
|
|
// Read line by line
|
|
for scanner.Scan() {
|
|
split := strings.Fields(scanner.Text())
|
|
if len(split) != 2 {
|
|
continue
|
|
}
|
|
key := split[0]
|
|
value, err := strconv.ParseInt(split[1], 10, 64)
|
|
if err != nil {
|
|
cclog.ComponentError(
|
|
m.name,
|
|
fmt.Sprintf("Read(): Failed to convert %s='%s' to int64: %v", key, split[1], err))
|
|
continue
|
|
}
|
|
y, err := lp.NewMessage(
|
|
"numastats_"+key,
|
|
t.tagSet,
|
|
m.meta,
|
|
map[string]interface{}{"value": value},
|
|
now,
|
|
)
|
|
if err == nil {
|
|
output <- y
|
|
}
|
|
}
|
|
|
|
file.Close()
|
|
}
|
|
}
|
|
|
|
func (m *NUMAStatsCollector) Close() {
|
|
m.init = false
|
|
}
|