Skip to content

Commit 95910af

Browse files
authored
Fix naming of k8s entries to ipfix export (#427)
1 parent 3c3c1f3 commit 95910af

File tree

2 files changed

+28
-9
lines changed

2 files changed

+28
-9
lines changed

hack/examples/ipfix-collector/ipfix-dump.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ func loadSevoneRegistry() error {
5959
fmt.Printf("Failed to register sourceNodeName")
6060
return err
6161
}
62+
err = registry.PutInfoElement((*entities.NewInfoElement("destinationNodeName", 7738, 13, SevoneEnterpriseID, 65535)), SevoneEnterpriseID)
63+
if err != nil {
64+
fmt.Printf("Failed to register destinationNodeName")
65+
return err
66+
}
6267
return nil
6368
}
6469
func printIPFIXMessage(msg *entities.Message) {

pkg/pipeline/write/write_ipfix.go

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ func addKubeContextToTemplate(elements *[]entities.InfoElementWithValue, registr
8181
if err != nil {
8282
return err
8383
}
84+
err = addElementToTemplate("destinationNodeName", nil, elements, registryID)
85+
if err != nil {
86+
return err
87+
}
8488
return nil
8589
}
8690

@@ -115,6 +119,11 @@ func loadCustomRegistry(EnterpriseID uint32) error {
115119
ilog.WithError(err).Errorf("Failed to register element")
116120
return err
117121
}
122+
err = registry.PutInfoElement((*entities.NewInfoElement("destinationNodeName", 7738, 13, EnterpriseID, 65535)), EnterpriseID)
123+
if err != nil {
124+
ilog.WithError(err).Errorf("Failed to register element")
125+
return err
126+
}
118127
return nil
119128
}
120129

@@ -407,30 +416,35 @@ func setKubeIEValue(record config.GenericMap, ieValPtr *entities.InfoElementWith
407416
ieVal.SetStringValue("none")
408417
}
409418
case "sourcePodName":
410-
if record["sourcePodName"] != nil {
411-
ieVal.SetStringValue(record["sourcePodName"].(string))
419+
if record["SrcK8S_Name"] != nil {
420+
ieVal.SetStringValue(record["SrcK8S_Name"].(string))
412421
} else {
413422
ieVal.SetStringValue("none")
414423
}
415424
case "destinationPodNamespace":
416-
if record["destinationPodNamespace"] != nil {
417-
ieVal.SetStringValue(record["destinationPodNamespace"].(string))
425+
if record["DstK8S_Namespace"] != nil {
426+
ieVal.SetStringValue(record["DstK8S_Namespace"].(string))
418427
} else {
419428
ieVal.SetStringValue("none")
420429
}
421430
case "destinationPodName":
422-
if record["destinationPodName"] != nil {
423-
ieVal.SetStringValue(record["destinationPodName"].(string))
431+
if record["DstK8S_Name"] != nil {
432+
ieVal.SetStringValue(record["DstK8S_Name"].(string))
424433
} else {
425434
ieVal.SetStringValue("none")
426435
}
427436
case "sourceNodeName":
428-
if record["sourceNodeName"] != nil {
429-
ieVal.SetStringValue(record["sourceNodeName"].(string))
437+
if record["SrcK8S_HostName"] != nil {
438+
ieVal.SetStringValue(record["SrcK8S_HostName"].(string))
439+
} else {
440+
ieVal.SetStringValue("none")
441+
}
442+
case "destinationNodeName":
443+
if record["DstK8S_HostName"] != nil {
444+
ieVal.SetStringValue(record["DstK8S_HostName"].(string))
430445
} else {
431446
ieVal.SetStringValue("none")
432447
}
433-
434448
}
435449
}
436450
func setEntities(record config.GenericMap, enrichEnterpriseID uint32, elements *[]entities.InfoElementWithValue) error {

0 commit comments

Comments
 (0)