From 456f4e039f2c52cd29b4adf0741895f6fb1b01e7 Mon Sep 17 00:00:00 2001 From: RockWolf Date: Thu, 29 May 2025 13:35:47 +0200 Subject: [PATCH] fix(netdev): respect deviceFilter for node_network_address_info metric Signed-off-by: RockWolf --- collector/netdev_common.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/collector/netdev_common.go b/collector/netdev_common.go index c19e5df5..f639a0e8 100644 --- a/collector/netdev_common.go +++ b/collector/netdev_common.go @@ -148,7 +148,7 @@ func (c *netDevCollector) Update(ch chan<- prometheus.Metric) error { "info"), "node network address by device", []string{"device", "address", "netmask", "scope"}, nil) - for _, addr := range getAddrsInfo(interfaces) { + for _, addr := range getAddrsInfo(interfaces, &c.deviceFilter, c.logger) { ch <- prometheus.MustNewConstMetric(desc, prometheus.GaugeValue, 1, addr.device, addr.addr, addr.netmask, addr.scope) } @@ -180,10 +180,14 @@ func scope(ip net.IP) string { } // getAddrsInfo returns interface name, address, scope and netmask for all interfaces. -func getAddrsInfo(interfaces []net.Interface) []addrInfo { +func getAddrsInfo(interfaces []net.Interface, filter *deviceFilter, logger *slog.Logger) []addrInfo { var res []addrInfo for _, ifs := range interfaces { + if filter.ignored(ifs.Name) { + logger.Debug("Ignoring device", "device", ifs.Name) + continue + } addrs, _ := ifs.Addrs() for _, addr := range addrs { ip, ipNet, err := net.ParseCIDR(addr.String())