Skip to content

Store flow logs as JSON, matching info/metrics #157

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.

Sign up for GitHub

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

Merged
rene merged 1 commit into from
Aug 3, 2026
Merged

Store flow logs as JSON, matching info/metrics #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions pkg/server/commonHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/lf-edge/adam/pkg/driver"
"github.com/lf-edge/adam/pkg/driver/common"
"github.com/lf-edge/eve-api/go/config"
"github.com/lf-edge/eve-api/go/flowlog"
"github.com/lf-edge/eve-api/go/info"
"github.com/lf-edge/eve-api/go/logs"
"github.com/lf-edge/eve-api/go/metrics"
Expand Down Expand Up @@ -385,12 +386,17 @@ func randomString(length int) string {

func flowLogProcess(manager driver.DeviceManager, flowlogsStream *stream,
u uuid.UUID, flowMessage []byte) (int, error) {
var err error
flowlogsStream.publish(instanceID{devUUID: u}, flowMessage)
err = manager.WriteFlowMessage(u, flowMessage)
msg := &flowlog.FlowMessage{}
if err := proto.Unmarshal(flowMessage, msg); err != nil {
return http.StatusBadRequest, fmt.Errorf("error parsing FlowMessage: %v", err)
}
jsonBytes, err := protojson.Marshal(msg)
if err != nil {
return http.StatusInternalServerError, fmt.Errorf("failed to marshal FlowMessage to json: %v", err)
}
flowlogsStream.publish(instanceID{devUUID: u}, jsonBytes)
if err := manager.WriteFlowMessage(u, append(jsonBytes, '\n')); err != nil {
return http.StatusInternalServerError, fmt.Errorf("failed to write FlowMessage: %v", err)
}
// send back a 201
return http.StatusCreated, nil
}
Loading