mirror of
https://github.com/ClusterCockpit/cc-metric-collector.git
synced 2024-12-26 15:29:04 +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>
183 lines
4.6 KiB
Go
183 lines
4.6 KiB
Go
package collectors
|
|
|
|
import (
|
|
"bufio"
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
|
|
cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
|
|
sysconf "github.com/tklauser/go-sysconf"
|
|
)
|
|
|
|
const CPUSTATFILE = `/proc/stat`
|
|
|
|
type CpustatCollectorConfig struct {
|
|
ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
|
|
}
|
|
|
|
type CpustatCollector struct {
|
|
metricCollector
|
|
config CpustatCollectorConfig
|
|
lastTimestamp time.Time // Store time stamp of last tick to derive values
|
|
matches map[string]int
|
|
cputags map[string]map[string]string
|
|
nodetags map[string]string
|
|
olddata map[string]map[string]int64
|
|
}
|
|
|
|
func (m *CpustatCollector) Init(config json.RawMessage) error {
|
|
m.name = "CpustatCollector"
|
|
m.setup()
|
|
m.parallel = true
|
|
m.meta = map[string]string{"source": m.name, "group": "CPU"}
|
|
m.nodetags = map[string]string{"type": "node"}
|
|
if len(config) > 0 {
|
|
err := json.Unmarshal(config, &m.config)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
matches := map[string]int{
|
|
"cpu_user": 1,
|
|
"cpu_nice": 2,
|
|
"cpu_system": 3,
|
|
"cpu_idle": 4,
|
|
"cpu_iowait": 5,
|
|
"cpu_irq": 6,
|
|
"cpu_softirq": 7,
|
|
"cpu_steal": 8,
|
|
"cpu_guest": 9,
|
|
"cpu_guest_nice": 10,
|
|
}
|
|
|
|
m.matches = make(map[string]int)
|
|
for match, index := range matches {
|
|
doExclude := false
|
|
for _, exclude := range m.config.ExcludeMetrics {
|
|
if match == exclude {
|
|
doExclude = true
|
|
break
|
|
}
|
|
}
|
|
if !doExclude {
|
|
m.matches[match] = index
|
|
}
|
|
}
|
|
|
|
// Check input file
|
|
file, err := os.Open(string(CPUSTATFILE))
|
|
if err != nil {
|
|
cclog.ComponentError(m.name, err.Error())
|
|
}
|
|
defer file.Close()
|
|
|
|
// Pre-generate tags for all CPUs
|
|
num_cpus := 0
|
|
m.cputags = make(map[string]map[string]string)
|
|
m.olddata = make(map[string]map[string]int64)
|
|
scanner := bufio.NewScanner(file)
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
linefields := strings.Fields(line)
|
|
if strings.Compare(linefields[0], "cpu") == 0 {
|
|
m.olddata["cpu"] = make(map[string]int64)
|
|
for k, v := range m.matches {
|
|
m.olddata["cpu"][k], _ = strconv.ParseInt(linefields[v], 0, 64)
|
|
}
|
|
} else if strings.HasPrefix(linefields[0], "cpu") && strings.Compare(linefields[0], "cpu") != 0 {
|
|
cpustr := strings.TrimLeft(linefields[0], "cpu")
|
|
cpu, _ := strconv.Atoi(cpustr)
|
|
m.cputags[linefields[0]] = map[string]string{"type": "hwthread", "type-id": fmt.Sprintf("%d", cpu)}
|
|
m.olddata[linefields[0]] = make(map[string]int64)
|
|
for k, v := range m.matches {
|
|
m.olddata[linefields[0]][k], _ = strconv.ParseInt(linefields[v], 0, 64)
|
|
}
|
|
num_cpus++
|
|
}
|
|
}
|
|
m.lastTimestamp = time.Now()
|
|
m.init = true
|
|
return nil
|
|
}
|
|
|
|
func (m *CpustatCollector) parseStatLine(linefields []string, tags map[string]string, output chan lp.CCMessage, now time.Time, tsdelta time.Duration) {
|
|
values := make(map[string]float64)
|
|
clktck, _ := sysconf.Sysconf(sysconf.SC_CLK_TCK)
|
|
for match, index := range m.matches {
|
|
if len(match) > 0 {
|
|
x, err := strconv.ParseInt(linefields[index], 0, 64)
|
|
if err == nil {
|
|
vdiff := x - m.olddata[linefields[0]][match]
|
|
m.olddata[linefields[0]][match] = x // Store new value for next run
|
|
values[match] = float64(vdiff) / float64(tsdelta.Seconds()) / float64(clktck)
|
|
}
|
|
}
|
|
}
|
|
|
|
sum := float64(0)
|
|
for name, value := range values {
|
|
sum += value
|
|
y, err := lp.NewMessage(name, tags, m.meta, map[string]interface{}{"value": value * 100}, now)
|
|
if err == nil {
|
|
y.AddTag("unit", "Percent")
|
|
output <- y
|
|
}
|
|
}
|
|
if v, ok := values["cpu_idle"]; ok {
|
|
sum -= v
|
|
y, err := lp.NewMessage("cpu_used", tags, m.meta, map[string]interface{}{"value": sum * 100}, now)
|
|
if err == nil {
|
|
y.AddTag("unit", "Percent")
|
|
output <- y
|
|
}
|
|
}
|
|
}
|
|
|
|
func (m *CpustatCollector) Read(interval time.Duration, output chan lp.CCMessage) {
|
|
if !m.init {
|
|
return
|
|
}
|
|
num_cpus := 0
|
|
now := time.Now()
|
|
tsdelta := now.Sub(m.lastTimestamp)
|
|
|
|
file, err := os.Open(string(CPUSTATFILE))
|
|
if err != nil {
|
|
cclog.ComponentError(m.name, err.Error())
|
|
}
|
|
defer file.Close()
|
|
|
|
scanner := bufio.NewScanner(file)
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
linefields := strings.Fields(line)
|
|
if strings.Compare(linefields[0], "cpu") == 0 {
|
|
m.parseStatLine(linefields, m.nodetags, output, now, tsdelta)
|
|
} else if strings.HasPrefix(linefields[0], "cpu") {
|
|
m.parseStatLine(linefields, m.cputags[linefields[0]], output, now, tsdelta)
|
|
num_cpus++
|
|
}
|
|
}
|
|
|
|
num_cpus_metric, err := lp.NewMessage("num_cpus",
|
|
m.nodetags,
|
|
m.meta,
|
|
map[string]interface{}{"value": int(num_cpus)},
|
|
now,
|
|
)
|
|
if err == nil {
|
|
output <- num_cpus_metric
|
|
}
|
|
|
|
m.lastTimestamp = now
|
|
}
|
|
|
|
func (m *CpustatCollector) Close() {
|
|
m.init = false
|
|
}
|