Skip to content

Commit fe96c83

Browse files
committed
Warn about deprecated API usage
1 parent 587ece1 commit fe96c83

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

contrib/kubernetes/flowlogs-pipeline.conf.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ pipeline:
2020
parameters:
2121
- name: ingest_collector
2222
ingest:
23-
type: collector
24-
collector:
23+
type: ipfix
24+
ipfix:
2525
hostName: 0.0.0.0
2626
port: 2055
2727
portLegacy: 2056

hack/examples/docker-ipfix-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ pipeline:
1919
parameters:
2020
- name: ingest
2121
ingest: # use nflow generator to simulate flows: ./nflow-generator -t localhost -p 2055
22-
type: collector
23-
collector:
22+
type: ipfix
23+
ipfix:
2424
hostName: localhost
2525
port: 4739 # Use this for IPFIX / netflow v9
2626
portLegacy: 2055 # Use this for legacy v5 netflow

pkg/pipeline/pipeline_builder.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,10 @@ func getIngester(opMetrics *operational.Metrics, params config.StageParam) (inge
396396
ingester, err = ingest.NewIngestFile(params)
397397
case api.SyntheticType:
398398
ingester, err = ingest.NewIngestSynthetic(opMetrics, params)
399-
case api.CollectorType, api.IpfixType:
399+
case api.CollectorType:
400+
log.Warnf("Stage %s uses deprecated 'collector' API. It should be renamed 'ipfix', as 'collector' will be removed in a future release.", params.Name)
401+
ingester, err = ingest.NewIngestIPFIX(opMetrics, params)
402+
case api.IpfixType:
400403
ingester, err = ingest.NewIngestIPFIX(opMetrics, params)
401404
case api.StdinType:
402405
ingester, err = ingest.NewIngestStdin(opMetrics, params)

pkg/pipeline/pipeline_builder_test.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package pipeline
22

33
import (
44
"errors"
5+
"reflect"
56
"testing"
67

78
"github.com/netobserv/flowlogs-pipeline/pkg/test"
@@ -30,6 +31,27 @@ func TestConnectionVerification_Pass(t *testing.T) {
3031
assert.NoError(t, err)
3132
}
3233

34+
func TestPipelineIPFIXBackwardCompatible(t *testing.T) {
35+
_, cfg := test.InitConfig(t, `
36+
pipeline:
37+
- follows: ingest1
38+
name: write1
39+
parameters:
40+
- name: ingest1
41+
ingest:
42+
type: collector
43+
- name: write1
44+
write:
45+
type: none
46+
`)
47+
p, err := NewPipeline(cfg)
48+
assert.NoError(t, err)
49+
50+
assert.NotNil(t, p.pipelineStages[0].Ingester)
51+
ty := reflect.TypeOf(p.pipelineStages[0].Ingester)
52+
assert.Equal(t, "*ingest.ingestIPFIX", ty.String())
53+
}
54+
3355
func TestConnectionVerification(t *testing.T) {
3456
type testCase struct {
3557
description string

0 commit comments

Comments
 (0)