mirror of
https://github.com/ClusterCockpit/cc-metric-collector.git
synced 2024-11-10 04:27:25 +01:00
ec570f884c
* Merge develop and main (#99) * InfiniBandCollector: Scale raw readings from octets to bytes * Fix clock frequency coming from LikwidCollector and update docs * Build DEB package for Ubuntu 20.04 for releases * Fix memstat collector with numa_stats option * Remove useless prints from MemstatCollector * Replace ioutils with os and io (#87) * Use lower case for error strings in RocmSmiCollector * move maybe-usable-by-other-cc-components to pkg. Fix all files to use the new paths (#88) * Add collector for monitoring the execution of cc-metric-collector itself (#81) * Add collector to monitor execution of cc-metric-collector itself * Register SelfCollector * Fix import paths for moved packages * Check if at least one CPU with frequency information was detected * Correct type: /proc/stats -> /proc/stat * Update README.md * Run ipmitool asynchron. Improved error handling. * Corrected some typos * Add running average power limit (RAPL) metric collector * Add running average power limit (RAPL) metric collector * Do not mess up with the orignal configuration * * Corrected json config in numastatsMetric.md * Added some debug output to numastatsMetric.go * Fixed computing number of physical packages for non continous physical package IDs (e.g. on Ampere Altra Q80-30) * Fix kernel panic for receiver config with missing receiver type * Add receiver to gather remote IPMI sensor metrics * Added config option to add ipmi-sensors command line options * Add documentaion for IPMI receiver * Update to latest version of included go modules * Add go.mod to App dependency * Try to use common metric tags across hardware vendors * Add IPMI metric: current * remove prefix enumeration like 01-... * Add IPMI receiver example configuration to receivers.json * Minimal formating changes * Add hostlist package * Added tests for hostlist Expand() * Use package hostlist to expand a host list * Use package hostlist to expand a host list * Some servers return "ConsumedPowerWatt":65535 instead of "ConsumedPowerWatt":null * Updated to latest package versions * Do not allow unknown fields in JSON configuration file * Add workflow to customize packages to docs * NFS I/O Stats Collector (#91) * Initial version * Delete values for vanished mount points and comments * Fix for Likwid collector (#95) * Run LIKWID in separate thread and check metric type * Change LIKWID collector documentation to use 'type' instead of 'scope' * Re-initialize LIKWID after one read is missing due to lock toggle * Register cc-metric-collector at Zenodo (#93) * Add initial version of Zenodo project file * Orcid ID added * Update .zenodo.json Co-authored-by: Holger Obermaier <holger.obermaier@kit.edu> * Update ipmiMetric.go * Use latest LIKWID version for builds * Update README.md * Remove development stuff from Makefile * Add Requires(pre) to RPM SPEC file * Use curly brackets in packaging make targets * Fix for LIKWID collector with separate measurement thread and inotify watcher on the LIKWID lock (#97) Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> Co-authored-by: Holger Obermaier <Holger.Obermaier@kit.edu> * Update likwid_perfgroup_to_cc_config.py * Use customcmd commands if they did not error. --------- Co-authored-by: Thomas Gruber <Thomas.Roehl@googlemail.com> Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> Co-authored-by: Holger Obermaier <Holger.Obermaier@kit.edu>
135 lines
2.8 KiB
Go
135 lines
2.8 KiB
Go
package collectors
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"log"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"time"
|
|
|
|
lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
|
|
influx "github.com/influxdata/line-protocol"
|
|
)
|
|
|
|
const CUSTOMCMDPATH = `/home/unrz139/Work/cc-metric-collector/collectors/custom`
|
|
|
|
type CustomCmdCollectorConfig struct {
|
|
Commands []string `json:"commands"`
|
|
Files []string `json:"files"`
|
|
ExcludeMetrics []string `json:"exclude_metrics"`
|
|
}
|
|
|
|
type CustomCmdCollector struct {
|
|
metricCollector
|
|
handler *influx.MetricHandler
|
|
parser *influx.Parser
|
|
config CustomCmdCollectorConfig
|
|
commands []string
|
|
files []string
|
|
}
|
|
|
|
func (m *CustomCmdCollector) Init(config json.RawMessage) error {
|
|
var err error
|
|
m.name = "CustomCmdCollector"
|
|
m.parallel = true
|
|
m.meta = map[string]string{"source": m.name, "group": "Custom"}
|
|
if len(config) > 0 {
|
|
err = json.Unmarshal(config, &m.config)
|
|
if err != nil {
|
|
log.Print(err.Error())
|
|
return err
|
|
}
|
|
}
|
|
m.setup()
|
|
for _, c := range m.config.Commands {
|
|
cmdfields := strings.Fields(c)
|
|
command := exec.Command(cmdfields[0], strings.Join(cmdfields[1:], " "))
|
|
command.Wait()
|
|
_, err = command.Output()
|
|
if err == nil {
|
|
m.commands = append(m.commands, c)
|
|
}
|
|
}
|
|
for _, f := range m.config.Files {
|
|
_, err = os.ReadFile(f)
|
|
if err == nil {
|
|
m.files = append(m.files, f)
|
|
} else {
|
|
log.Print(err.Error())
|
|
continue
|
|
}
|
|
}
|
|
if len(m.files) == 0 && len(m.commands) == 0 {
|
|
return errors.New("no metrics to collect")
|
|
}
|
|
m.handler = influx.NewMetricHandler()
|
|
m.parser = influx.NewParser(m.handler)
|
|
m.parser.SetTimeFunc(DefaultTime)
|
|
m.init = true
|
|
return nil
|
|
}
|
|
|
|
var DefaultTime = func() time.Time {
|
|
return time.Unix(42, 0)
|
|
}
|
|
|
|
func (m *CustomCmdCollector) Read(interval time.Duration, output chan lp.CCMetric) {
|
|
if !m.init {
|
|
return
|
|
}
|
|
for _, cmd := range m.commands {
|
|
cmdfields := strings.Fields(cmd)
|
|
command := exec.Command(cmdfields[0], strings.Join(cmdfields[1:], " "))
|
|
command.Wait()
|
|
stdout, err := command.Output()
|
|
if err != nil {
|
|
log.Print(err)
|
|
continue
|
|
}
|
|
cmdmetrics, err := m.parser.Parse(stdout)
|
|
if err != nil {
|
|
log.Print(err)
|
|
continue
|
|
}
|
|
for _, c := range cmdmetrics {
|
|
_, skip := stringArrayContains(m.config.ExcludeMetrics, c.Name())
|
|
if skip {
|
|
continue
|
|
}
|
|
|
|
y := lp.FromInfluxMetric(c)
|
|
if err == nil {
|
|
output <- y
|
|
}
|
|
}
|
|
}
|
|
for _, file := range m.files {
|
|
buffer, err := os.ReadFile(file)
|
|
if err != nil {
|
|
log.Print(err)
|
|
return
|
|
}
|
|
fmetrics, err := m.parser.Parse(buffer)
|
|
if err != nil {
|
|
log.Print(err)
|
|
continue
|
|
}
|
|
for _, f := range fmetrics {
|
|
_, skip := stringArrayContains(m.config.ExcludeMetrics, f.Name())
|
|
if skip {
|
|
continue
|
|
}
|
|
y := lp.FromInfluxMetric(f)
|
|
if err == nil {
|
|
output <- y
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (m *CustomCmdCollector) Close() {
|
|
m.init = false
|
|
}
|