From 06a878bb4c27c85c4b9b0ee66e27839cc8229386 Mon Sep 17 00:00:00 2001 From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> Date: Thu, 10 Mar 2022 16:52:40 +0100 Subject: [PATCH] Set default config values --- collectors/netstatMetric.go | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/collectors/netstatMetric.go b/collectors/netstatMetric.go index 197c5b6..f0cb1e8 100644 --- a/collectors/netstatMetric.go +++ b/collectors/netstatMetric.go @@ -72,6 +72,11 @@ func (m *NetstatCollector) Init(config json.RawMessage) error { } m.matches = make(map[string]map[string]NetstatCollectorMetric) + + // Set default configuration, + m.config.SendAbsoluteValues = true + m.config.SendDerivedValues = false + // Read configuration file, allow overwriting default config if len(config) > 0 { err := json.Unmarshal(config, &m.config) if err != nil { @@ -79,6 +84,8 @@ func (m *NetstatCollector) Init(config json.RawMessage) error { return err } } + + // Check access to net statistic file file, err := os.Open(NETSTATFILE) if err != nil { cclog.ComponentError(m.name, err.Error()) @@ -89,11 +96,19 @@ func (m *NetstatCollector) Init(config json.RawMessage) error { scanner := bufio.NewScanner(file) for scanner.Scan() { l := scanner.Text() + + // Skip lines with no net device entry if !strings.Contains(l, ":") { continue } + + // Split line into fields f := strings.Fields(l) + + // Get net device entry dev := strings.Trim(f[0], ": ") + + // Check if device is a included device if _, ok := stringArrayContains(m.config.IncludeDevices, dev); ok { m.matches[dev] = make(map[string]NetstatCollectorMetric) for name, idx := range nameIndexMap { @@ -102,7 +117,10 @@ func (m *NetstatCollector) Init(config json.RawMessage) error { lastValue: 0, } } - m.devtags[dev] = map[string]string{"device": dev, "type": "node"} + m.devtags[dev] = map[string]string{ + "device": dev, + "type": "node", + } } } if len(m.devtags) == 0 {