Skip to content

fix(netdev): respect deviceFilter for node_network_address_info metric #3340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(netdev): respect deviceFilter for node_network_address_info metric #3340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions collector/netdev_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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())
Expand Down