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>
157 lines
3.4 KiB
Go
157 lines
3.4 KiB
Go
package collectors
|
|
|
|
import (
|
|
"bufio"
|
|
"os"
|
|
|
|
cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
|
|
lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
|
|
|
|
// "log"
|
|
"encoding/json"
|
|
"errors"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
const IOSTATFILE = `/proc/diskstats`
|
|
const IOSTAT_SYSFSPATH = `/sys/block`
|
|
|
|
type IOstatCollectorConfig struct {
|
|
ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
|
|
}
|
|
|
|
type IOstatCollectorEntry struct {
|
|
lastValues map[string]int64
|
|
tags map[string]string
|
|
}
|
|
|
|
type IOstatCollector struct {
|
|
metricCollector
|
|
matches map[string]int
|
|
config IOstatCollectorConfig
|
|
devices map[string]IOstatCollectorEntry
|
|
}
|
|
|
|
func (m *IOstatCollector) Init(config json.RawMessage) error {
|
|
var err error
|
|
m.name = "IOstatCollector"
|
|
m.parallel = true
|
|
m.meta = map[string]string{"source": m.name, "group": "Disk"}
|
|
m.setup()
|
|
if len(config) > 0 {
|
|
err = json.Unmarshal(config, &m.config)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
// https://www.kernel.org/doc/html/latest/admin-guide/iostats.html
|
|
matches := map[string]int{
|
|
"io_reads": 3,
|
|
"io_reads_merged": 4,
|
|
"io_read_sectors": 5,
|
|
"io_read_ms": 6,
|
|
"io_writes": 7,
|
|
"io_writes_merged": 8,
|
|
"io_writes_sectors": 9,
|
|
"io_writes_ms": 10,
|
|
"io_ioops": 11,
|
|
"io_ioops_ms": 12,
|
|
"io_ioops_weighted_ms": 13,
|
|
"io_discards": 14,
|
|
"io_discards_merged": 15,
|
|
"io_discards_sectors": 16,
|
|
"io_discards_ms": 17,
|
|
"io_flushes": 18,
|
|
"io_flushes_ms": 19,
|
|
}
|
|
m.devices = make(map[string]IOstatCollectorEntry)
|
|
m.matches = make(map[string]int)
|
|
for k, v := range matches {
|
|
if _, skip := stringArrayContains(m.config.ExcludeMetrics, k); !skip {
|
|
m.matches[k] = v
|
|
}
|
|
}
|
|
if len(m.matches) == 0 {
|
|
return errors.New("no metrics to collect")
|
|
}
|
|
file, err := os.Open(string(IOSTATFILE))
|
|
if err != nil {
|
|
cclog.ComponentError(m.name, err.Error())
|
|
return err
|
|
}
|
|
defer file.Close()
|
|
|
|
scanner := bufio.NewScanner(file)
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
linefields := strings.Fields(line)
|
|
device := linefields[2]
|
|
if strings.Contains(device, "loop") {
|
|
continue
|
|
}
|
|
values := make(map[string]int64)
|
|
for m := range m.matches {
|
|
values[m] = 0
|
|
}
|
|
m.devices[device] = IOstatCollectorEntry{
|
|
tags: map[string]string{
|
|
"device": linefields[2],
|
|
"type": "node",
|
|
},
|
|
lastValues: values,
|
|
}
|
|
}
|
|
m.init = true
|
|
return err
|
|
}
|
|
|
|
func (m *IOstatCollector) Read(interval time.Duration, output chan lp.CCMessage) {
|
|
if !m.init {
|
|
return
|
|
}
|
|
|
|
file, err := os.Open(string(IOSTATFILE))
|
|
if err != nil {
|
|
cclog.ComponentError(m.name, err.Error())
|
|
return
|
|
}
|
|
defer file.Close()
|
|
|
|
scanner := bufio.NewScanner(file)
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
if len(line) == 0 {
|
|
continue
|
|
}
|
|
linefields := strings.Fields(line)
|
|
device := linefields[2]
|
|
if strings.Contains(device, "loop") {
|
|
continue
|
|
}
|
|
if _, ok := m.devices[device]; !ok {
|
|
continue
|
|
}
|
|
entry := m.devices[device]
|
|
for name, idx := range m.matches {
|
|
if idx < len(linefields) {
|
|
x, err := strconv.ParseInt(linefields[idx], 0, 64)
|
|
if err == nil {
|
|
diff := x - entry.lastValues[name]
|
|
y, err := lp.NewMessage(name, entry.tags, m.meta, map[string]interface{}{"value": int(diff)}, time.Now())
|
|
if err == nil {
|
|
output <- y
|
|
}
|
|
}
|
|
entry.lastValues[name] = x
|
|
}
|
|
}
|
|
m.devices[device] = entry
|
|
}
|
|
}
|
|
|
|
func (m *IOstatCollector) Close() {
|
|
m.init = false
|
|
}
|