NetFlow/IPFIX: render sampler address as string (#950)

jotak · web-flow · commit 13e630b688a0 · 2025-05-06T19:03:12.000+02:00
Fixes #940
diff --git a/pkg/pipeline/ingest/ingest_collector.go b/pkg/pipeline/ingest/ingest_collector.go
@@ -70,6 +70,7 @@ func RenderMessage(message *goflowpb.FlowMessage) (map[string]interface{}, error
 	}
 	outputMap["DstAddr"] = goflowCommonFormat.RenderIP(message.DstAddr)
 	outputMap["SrcAddr"] = goflowCommonFormat.RenderIP(message.SrcAddr)
+	outputMap["SamplerAddress"] = goflowCommonFormat.RenderIP(message.SamplerAddress)
 	outputMap["DstMac"] = renderMac(message.DstMac)
 	outputMap["SrcMac"] = renderMac(message.SrcMac)
 	return outputMap, nil
diff --git a/pkg/pipeline/ingest/ingest_collector_test.go b/pkg/pipeline/ingest/ingest_collector_test.go
@@ -53,6 +53,7 @@ func TestIngest(t *testing.T) {
 	assert.EqualValues(t, 12345678, flow["TimeFlowStart"])
 	assert.EqualValues(t, 12345678, flow["TimeFlowEnd"])
 	assert.Equal(t, "1.2.3.4", flow["SrcAddr"])
+	assert.Equal(t, "127.0.0.1", flow["SamplerAddress"])
 }
 
 // The IPFIX client might send information before the Ingester is actually listening,

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ func RenderMessage(message *goflowpb.FlowMessage) (map[string]interface{}, error`
`70`	`70`	`}`
`71`	`71`	`outputMap["DstAddr"] = goflowCommonFormat.RenderIP(message.DstAddr)`
`72`	`72`	`outputMap["SrcAddr"] = goflowCommonFormat.RenderIP(message.SrcAddr)`
	`73`	`+ outputMap["SamplerAddress"] = goflowCommonFormat.RenderIP(message.SamplerAddress)`
`73`	`74`	`outputMap["DstMac"] = renderMac(message.DstMac)`
`74`	`75`	`outputMap["SrcMac"] = renderMac(message.SrcMac)`
`75`	`76`	`return outputMap, nil`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ func TestIngest(t *testing.T) {`
`53`	`53`	`assert.EqualValues(t, 12345678, flow["TimeFlowStart"])`
`54`	`54`	`assert.EqualValues(t, 12345678, flow["TimeFlowEnd"])`
`55`	`55`	`assert.Equal(t, "1.2.3.4", flow["SrcAddr"])`
	`56`	`+ assert.Equal(t, "127.0.0.1", flow["SamplerAddress"])`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`// The IPFIX client might send information before the Ingester is actually listening,`