fix neighbor flag handling

telekom · Jan 18, 2024 · ab6f52e · ab6f52e
1 parent e4c0fe4
commit ab6f52e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/monitoring/nl.go b/pkg/monitoring/nl.go
@@ -36,7 +36,7 @@ func NewNetlinkCollector() (Collector, error) {
 			desc: prometheus.NewDesc(
 				prometheus.BuildFQName(namespace, "netlink", "neighbors"),
 				"The number of neighbors currently in the Linux Dataplane.",
-				[]string{"interface", "address_family", "status"},
+				[]string{"interface", "address_family", "flags", "status"},
 				nil,
 			),
 			valueType: prometheus.GaugeValue,
@@ -64,7 +64,7 @@ func (c *netlinkCollector) updateNeighbors(ch chan<- prometheus.Metric) {
 		c.logger.Error(err, "Cannot get neighbors from netlink")
 	}
 	for _, neighbor := range neighbors {
-		ch <- c.neighborsDesc.mustNewConstMetric(neighbor.Quantity, neighbor.Interface, neighbor.Family, neighbor.State)
+		ch <- c.neighborsDesc.mustNewConstMetric(neighbor.Quantity, neighbor.Interface, neighbor.Family, neighbor.Flag, neighbor.State)
 	}
 }
 

diff --git a/pkg/nl/layer2.go b/pkg/nl/layer2.go
@@ -42,7 +42,7 @@ type NeighborInformation struct {
 	Quantity  float64
 }
 type NeighborKey struct {
-	InterfaceIndex, State, Family int
+	InterfaceIndex, State, Flags, Family int
 }
 
 func getNeighborState(state int) (string, error) {
@@ -469,7 +469,7 @@ func (n *NetlinkManager) ListNeighborInformation() ([]NeighborInformation, error
 			strings.HasPrefix(interfaceName, macvlanPrefix) ||
 			strings.HasPrefix(interfaceName, layer2Prefix) ||
 			linkInfo.Attrs().Vfs != nil {
-			neighborKey := NeighborKey{InterfaceIndex: netlinkNeighbors[index].LinkIndex, State: netlinkNeighbors[index].State, Family: netlinkNeighbors[index].Family}
+			neighborKey := NeighborKey{InterfaceIndex: netlinkNeighbors[index].LinkIndex, State: netlinkNeighbors[index].State, Flags: netlinkNeighbors[index].Flags, Family: netlinkNeighbors[index].Family}
 			neighborInformation, ok := neighbors[neighborKey]
 			if ok {
 				neighborInformation.Quantity++