mirror of
https://github.com/ClusterCockpit/cc-metric-collector.git
synced 2024-11-10 04:27:25 +01:00
8d85bd53f1
* Cleanup: Remove unused code * Use Golang duration parser for 'interval' and 'duration' in main config * Update handling of LIKWID headers. Download only if not already present in the system. Fixes #73 * Units with cc-units (#64) * Add option to normalize units with cc-unit * Add unit conversion to router * Add option to change unit prefix in the router * Add to MetricRouter README * Add order of operations in router to README * Use second add_tags/del_tags only if metric gets renamed * Skip disks in DiskstatCollector that have size=0 * Check readability of sensor files in TempCollector * Fix for --once option * Rename `cpu` type to `hwthread` (#69) * Rename 'cpu' type to 'hwthread' to avoid naming clashes with MetricStore and CC-Webfrontend * Collectors in parallel (#74) * Provide info to CollectorManager whether the collector can be executed in parallel with others * Split serial and parallel collectors. Read in parallel first * Update NvidiaCollector with new metrics, MIG and NvLink support (#75) * CC topology module update (#76) * Rename CPU to hardware thread, write some comments * Do renaming in other parts * Remove CpuList and SocketList function from metricCollector. Available in ccTopology * Option to use MIG UUID as subtype-id in NvidiaCollector * Option to use MIG slice name as subtype-id in NvidiaCollector * MetricRouter: Fix JSON in README * Fix for Github Action to really use the selected version * Remove Ganglia installation in runonce Action and add Go 1.18 * Fix daemon options in init script * Add separate go.mod files to use it with deprecated 1.16 * Minor updates for Makefiles * fix string comparison * AMD ROCm SMI collector (#77) * Add collector for AMD ROCm SMI metrics * Fix import path * Fix imports * Remove Board Number * store GPU index explicitly * Remove board number from description * Use http instead of ftp to download likwid * Fix serial number in rocmCollector * Improved http sink (#78) * automatic flush in NatsSink * tweak default options of HttpSink * shorter cirt. section and retries for HttpSink * fix error handling * Remove file added by mistake. * Use http instead of ftp to download likwid * Fix serial number in rocmCollector Co-authored-by: Thomas Roehl <thomas.roehl@fau.de> Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> Co-authored-by: Lou <lou.knauer@gmx.de>
141 lines
3.1 KiB
Go
141 lines
3.1 KiB
Go
package collectors
|
|
|
|
import (
|
|
"bufio"
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
|
|
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
|
|
)
|
|
|
|
//
|
|
// 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},
|
|
})
|
|
}
|
|
|
|
m.init = true
|
|
return nil
|
|
}
|
|
|
|
func (m *NUMAStatsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
|
|
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.New(
|
|
"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
|
|
}
|