diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 66ea5420..fad698f2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,11 +8,9 @@ on: - master - next - main + - "0.*" + - "1.*" pull_request: - branches: - - master - - next - - main env: VERSION_PROMU: '0.14.0' diff --git a/internal/collector/net/net.go b/internal/collector/net/net.go index e3af2a39..efad8e63 100644 --- a/internal/collector/net/net.go +++ b/internal/collector/net/net.go @@ -33,7 +33,12 @@ import ( "golang.org/x/sys/windows" ) -const Name = "net" +const ( + Name = "net" + + subCollectorMetrics = "metrics" + subCollectorNicInfo = "nic_addresses" +) type Config struct { NicExclude *regexp.Regexp `yaml:"nic_exclude"` @@ -46,8 +51,8 @@ var ConfigDefaults = Config{ NicExclude: types.RegExpEmpty, NicInclude: types.RegExpAny, CollectorsEnabled: []string{ - "metrics", - "nic_addresses", + subCollectorMetrics, + subCollectorNicInfo, }, } @@ -284,7 +289,7 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error { } if slices.Contains(c.config.CollectorsEnabled, subCollectorNicInfo) { - if err := c.collectNICInfo(ch); err != nil { + if err := c.collectNICAddresses(ch); err != nil { errs = append(errs, fmt.Errorf("failed collecting net addresses: %w", err)) } }