-
Notifications
You must be signed in to change notification settings - Fork 24
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.
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
Allow to start FLP directly from the flow logs producer #538
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
86379eb
Allow to start FLP directly from the flow logs producer
jotak 2cd3625
Add builder functions ToConfig / IntoConfig
jotak dbe2422
Allow disabling operational metrics
jotak 7f50a93
Add log when prom disabled
jotak 0ca3b67
InProcess ingest now takes in channel as argument, directly with the
jotak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package ingest | ||
|
||
import ( | ||
"github.com/netobserv/flowlogs-pipeline/pkg/config" | ||
"github.com/netobserv/flowlogs-pipeline/pkg/pipeline/utils" | ||
"github.com/netobserv/netobserv-ebpf-agent/pkg/pbflow" | ||
|
||
"github.com/netobserv/netobserv-ebpf-agent/pkg/decode" | ||
"github.com/sirupsen/logrus" | ||
) | ||
|
||
var ilog = logrus.WithField("component", "ingest.InProcess") | ||
|
||
// InProcess ingester is meant to be imported and used from another program | ||
// via pipeline.StartFLPInProcess | ||
type InProcess struct { | ||
flowPackets chan *pbflow.Records | ||
} | ||
|
||
func NewInProcess(flowPackets chan *pbflow.Records) *InProcess { | ||
return &InProcess{flowPackets: flowPackets} | ||
} | ||
|
||
func (d *InProcess) Ingest(out chan<- config.GenericMap) { | ||
go func() { | ||
<-utils.ExitChannel() | ||
d.Close() | ||
}() | ||
for fp := range d.flowPackets { | ||
ilog.Debugf("Ingested %v records", len(fp.Entries)) | ||
for _, entry := range fp.Entries { | ||
out <- decode.PBFlowToMap(entry) | ||
} | ||
} | ||
} | ||
|
||
func (d *InProcess) Write(record *pbflow.Records) { | ||
d.flowPackets <- record | ||
} | ||
|
||
func (d *InProcess) Close() { | ||
close(d.flowPackets) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package pipeline | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
|
||
"github.com/netobserv/flowlogs-pipeline/pkg/config" | ||
"github.com/netobserv/flowlogs-pipeline/pkg/pipeline/ingest" | ||
"github.com/netobserv/flowlogs-pipeline/pkg/prometheus" | ||
"github.com/netobserv/netobserv-ebpf-agent/pkg/pbflow" | ||
) | ||
|
||
// StartFLPInProcess is an entry point to start the whole FLP / pipeline processing from imported code | ||
func StartFLPInProcess(cfg *config.ConfigFileStruct) (*ingest.InProcess, error) { | ||
prometheus.SetGlobalMetricsSettings(&cfg.MetricsSettings) | ||
promServer := prometheus.StartServerAsync(&cfg.MetricsSettings.PromConnectionInfo, nil) | ||
|
||
// Create new flows pipeline | ||
ingester := ingest.NewInProcess(make(chan *pbflow.Records, 100)) | ||
flp, err := newPipelineFromIngester(cfg, ingester) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to initialize pipeline %w", err) | ||
} | ||
|
||
// Starts the flows pipeline; blocking call | ||
go func() { | ||
flp.Run() | ||
_ = promServer.Shutdown(context.Background()) | ||
}() | ||
|
||
return ingester, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,121 @@ | ||
package pipeline | ||
|
||
import ( | ||
"bufio" | ||
"encoding/json" | ||
"os" | ||
"testing" | ||
"time" | ||
|
||
"github.com/netobserv/flowlogs-pipeline/pkg/api" | ||
"github.com/netobserv/flowlogs-pipeline/pkg/config" | ||
"github.com/netobserv/netobserv-ebpf-agent/pkg/pbflow" | ||
"github.com/stretchr/testify/assert" | ||
"github.com/stretchr/testify/require" | ||
"google.golang.org/protobuf/types/known/durationpb" | ||
"google.golang.org/protobuf/types/known/timestamppb" | ||
) | ||
|
||
func TestInProcessFLP(t *testing.T) { | ||
pipeline := config.NewPresetIngesterPipeline() | ||
pipeline = pipeline.WriteStdout("writer", api.WriteStdout{Format: "json"}) | ||
ingester, err := StartFLPInProcess(pipeline.ToConfigFileStruct()) | ||
require.NoError(t, err) | ||
defer ingester.Close() | ||
|
||
capturedOut, w, _ := os.Pipe() | ||
old := os.Stdout | ||
os.Stdout = w | ||
defer func() { | ||
os.Stdout = old | ||
}() | ||
|
||
// yield thread to allow pipe services correctly start | ||
time.Sleep(10 * time.Millisecond) | ||
|
||
startTime := time.Now() | ||
endTime := startTime.Add(7 * time.Second) | ||
someDuration := endTime.Sub(startTime) | ||
|
||
ingester.Write(&pbflow.Records{ | ||
Entries: []*pbflow.Record{{ | ||
Interface: "eth0", | ||
EthProtocol: 2048, | ||
Bytes: 456, | ||
Packets: 123, | ||
Direction: pbflow.Direction_EGRESS, | ||
TimeFlowStart: timestamppb.New(startTime), | ||
TimeFlowEnd: timestamppb.New(endTime), | ||
Network: &pbflow.Network{ | ||
SrcAddr: &pbflow.IP{ | ||
IpFamily: &pbflow.IP_Ipv4{Ipv4: 0x01020304}, | ||
}, | ||
DstAddr: &pbflow.IP{ | ||
IpFamily: &pbflow.IP_Ipv4{Ipv4: 0x05060708}, | ||
}, | ||
Dscp: 1, | ||
}, | ||
DataLink: &pbflow.DataLink{ | ||
DstMac: 0x112233445566, | ||
SrcMac: 0x010203040506, | ||
}, | ||
Transport: &pbflow.Transport{ | ||
Protocol: 17, | ||
SrcPort: 23000, | ||
DstPort: 443, | ||
}, | ||
AgentIp: &pbflow.IP{ | ||
IpFamily: &pbflow.IP_Ipv4{Ipv4: 0x0a0b0c0d}, | ||
}, | ||
PktDropBytes: 100, | ||
PktDropPackets: 10, | ||
PktDropLatestFlags: 1, | ||
PktDropLatestState: 1, | ||
PktDropLatestDropCause: 8, | ||
DnsLatency: durationpb.New(someDuration), | ||
DnsId: 1, | ||
DnsFlags: 0x80, | ||
DnsErrno: 0, | ||
TimeFlowRtt: durationpb.New(someDuration), | ||
}}, | ||
}) | ||
|
||
scanner := bufio.NewScanner(capturedOut) | ||
require.True(t, scanner.Scan()) | ||
capturedRecord := map[string]interface{}{} | ||
bytes := scanner.Bytes() | ||
require.NoError(t, json.Unmarshal(bytes, &capturedRecord), string(bytes)) | ||
|
||
assert.NotZero(t, capturedRecord["TimeReceived"]) | ||
delete(capturedRecord, "TimeReceived") | ||
assert.EqualValues(t, map[string]interface{}{ | ||
"FlowDirection": float64(1), | ||
"Bytes": float64(456), | ||
"SrcAddr": "1.2.3.4", | ||
"DstAddr": "5.6.7.8", | ||
"Dscp": float64(1), | ||
"DstMac": "11:22:33:44:55:66", | ||
"SrcMac": "01:02:03:04:05:06", | ||
"SrcPort": float64(23000), | ||
"DstPort": float64(443), | ||
"Duplicate": false, | ||
"Etype": float64(2048), | ||
"Packets": float64(123), | ||
"Proto": float64(17), | ||
"TimeFlowStartMs": float64(startTime.UnixMilli()), | ||
"TimeFlowEndMs": float64(endTime.UnixMilli()), | ||
"Interface": "eth0", | ||
"AgentIP": "10.11.12.13", | ||
"PktDropBytes": float64(100), | ||
"PktDropPackets": float64(10), | ||
"PktDropLatestFlags": float64(1), | ||
"PktDropLatestState": "TCP_ESTABLISHED", | ||
"PktDropLatestDropCause": "SKB_DROP_REASON_NETFILTER_DROP", | ||
"DnsLatencyMs": float64(someDuration.Milliseconds()), | ||
"DnsId": float64(1), | ||
"DnsFlags": float64(0x80), | ||
"DnsErrno": float64(0), | ||
"DnsFlagsResponseCode": "NoError", | ||
"TimeFlowRttNs": float64(someDuration.Nanoseconds()), | ||
}, capturedRecord) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about making this optionnal ?
If we are looking for lightweight solution we may skip prometheus since we have other export capabilities now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not only for prometheus pipeline output but also for the "operational metrics" ie. related to FLP health .. which doesn't mean it cannot be made optional, but I would say the default should still to have these metrics
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can add a field
enableOperational
in MetricsSettings.If it's set false, this "global" server would not be started, and it's still possible to start per-promencode stage servers.
However if it's disabled and the user didn't configure per-promencode servers (which is optional), then they wouldn't get any metric ... so it creates more configuration skews....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe
enableGlobalServer
would be a better name for the knob as it carries more explicitly that's it's neededif you don't configure per-stage server.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jpinsonneau done via dbe2422
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks !