From 2d792684ff50c1358a66eea4cecfe00515ba785a Mon Sep 17 00:00:00 2001 From: brinkcoder Date: Wed, 5 Mar 2025 01:07:26 +0100 Subject: [PATCH] add only_metrics --- collectors/loadavgMetric.go | 94 ++++++++++++++++--------------------- collectors/loadavgMetric.md | 21 ++++++--- 2 files changed, 55 insertions(+), 60 deletions(-) diff --git a/collectors/loadavgMetric.go b/collectors/loadavgMetric.go index 03bd37e..48a02ab 100644 --- a/collectors/loadavgMetric.go +++ b/collectors/loadavgMetric.go @@ -8,7 +8,7 @@ import ( "strings" "time" - lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) @@ -22,46 +22,41 @@ const LOADAVGFILE = "/proc/loadavg" type LoadavgCollector struct { metricCollector - tags map[string]string - load_matches []string - load_skips []bool - proc_matches []string - proc_skips []bool - config struct { + tags map[string]string + config struct { ExcludeMetrics []string `json:"exclude_metrics,omitempty"` + OnlyMetrics []string `json:"only_metrics,omitempty"` } } +func (m *LoadavgCollector) shouldOutput(metricName string) bool { + if len(m.config.OnlyMetrics) > 0 { + for _, n := range m.config.OnlyMetrics { + if n == metricName { + return true + } + } + return false + } + for _, n := range m.config.ExcludeMetrics { + if n == metricName { + return false + } + } + return true +} + func (m *LoadavgCollector) Init(config json.RawMessage) error { m.name = "LoadavgCollector" m.parallel = true m.setup() if len(config) > 0 { - err := json.Unmarshal(config, &m.config) - if err != nil { + if err := json.Unmarshal(config, &m.config); err != nil { return err } } - m.meta = map[string]string{ - "source": m.name, - "group": "LOAD"} + m.meta = map[string]string{"source": m.name, "group": "LOAD"} m.tags = map[string]string{"type": "node"} - m.load_matches = []string{ - "load_one", - "load_five", - "load_fifteen"} - m.load_skips = make([]bool, len(m.load_matches)) - m.proc_matches = []string{ - "proc_run", - "proc_total"} - m.proc_skips = make([]bool, len(m.proc_matches)) - - for i, name := range m.load_matches { - _, m.load_skips[i] = stringArrayContains(m.config.ExcludeMetrics, name) - } - for i, name := range m.proc_matches { - _, m.proc_skips[i] = stringArrayContains(m.config.ExcludeMetrics, name) - } m.init = true return nil } @@ -72,50 +67,43 @@ func (m *LoadavgCollector) Read(interval time.Duration, output chan lp.CCMessage } buffer, err := os.ReadFile(LOADAVGFILE) if err != nil { - cclog.ComponentError( - m.name, - fmt.Sprintf("Read(): Failed to read file '%s': %v", LOADAVGFILE, err)) + cclog.ComponentError(m.name, fmt.Sprintf("Read(): Failed to read file '%s': %v", LOADAVGFILE, err)) return } now := time.Now() + ls := strings.Split(string(buffer), " ") // Load metrics - ls := strings.Split(string(buffer), ` `) - for i, name := range m.load_matches { + loadMetrics := []string{"load_one", "load_five", "load_fifteen"} + for i, name := range loadMetrics { x, err := strconv.ParseFloat(ls[i], 64) if err != nil { - cclog.ComponentError( - m.name, - fmt.Sprintf("Read(): Failed to convert '%s' to float64: %v", ls[i], err)) + cclog.ComponentError(m.name, fmt.Sprintf("Read(): Failed to convert '%s' to float64: %v", ls[i], err)) continue } - if m.load_skips[i] { - continue - } - y, err := lp.NewMessage(name, m.tags, m.meta, map[string]interface{}{"value": x}, now) - if err == nil { - output <- y + if m.shouldOutput(name) { + y, err := lp.NewMessage(name, m.tags, m.meta, map[string]interface{}{"value": x}, now) + if err == nil { + output <- y + } } } // Process metrics lv := strings.Split(ls[3], `/`) - for i, name := range m.proc_matches { + procMetrics := []string{"proc_run", "proc_total"} + for i, name := range procMetrics { x, err := strconv.ParseInt(lv[i], 10, 64) if err != nil { - cclog.ComponentError( - m.name, - fmt.Sprintf("Read(): Failed to convert '%s' to float64: %v", lv[i], err)) + cclog.ComponentError(m.name, fmt.Sprintf("Read(): Failed to convert '%s' to int64: %v", lv[i], err)) continue } - if m.proc_skips[i] { - continue + if m.shouldOutput(name) { + y, err := lp.NewMessage(name, m.tags, m.meta, map[string]interface{}{"value": x}, now) + if err == nil { + output <- y + } } - y, err := lp.NewMessage(name, m.tags, m.meta, map[string]interface{}{"value": x}, now) - if err == nil { - output <- y - } - } } diff --git a/collectors/loadavgMetric.md b/collectors/loadavgMetric.md index d2b3f50..97a989b 100644 --- a/collectors/loadavgMetric.md +++ b/collectors/loadavgMetric.md @@ -1,19 +1,26 @@ - ## `loadavg` collector ```json "loadavg": { "exclude_metrics": [ "proc_run" + ], + "only_metrics": [ + "load_one", + "proc_total" ] } ``` -The `loadavg` collector reads data from `/proc/loadavg` and outputs a handful **node** metrics. If a metric is not required, it can be excluded from forwarding it to the sink. +The `loadavg` collector reads data from `/proc/loadavg` and outputs a handful **node** metrics. + +Both filtering mechanisms are supported: +- `exclude_metrics`: Excludes the specified metrics. +- `only_metrics`: If provided, only the listed metrics are collected. This takes precedence over `exclude_metrics`. Metrics: -* `load_one` -* `load_five` -* `load_fifteen` -* `proc_run` -* `proc_total` +- `load_one` +- `load_five` +- `load_fifteen` +- `proc_run` +- `proc_total`