Skip to content
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

feat(monitor): add an events channel to avoid event loss caused by delayed docker event processing #1930

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(monitor): add an events channel to avoid event loss caused by delayed docker event processing #1930

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11c9a81
add BufferedChannel to GetEventChannel
slashexx Jan 1, 2025
782838d
Merge branch 'main' into main
slashexx Jan 31, 2025
9d94a72
Merge branch 'main' into main
slashexx Feb 1, 2025
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
33 changes: 27 additions & 6 deletions KubeArmor/core/dockerHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"strings"
"time"

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events"
"github.com/docker/docker/client"
Expand Down Expand Up @@ -216,12 +215,30 @@ func (dh *DockerHandler) GetContainerInfo(containerID string, OwnerInfo map[stri
// ========================== //

// GetEventChannel Function
func (dh *DockerHandler) GetEventChannel() <-chan events.Message {
func (dh *DockerHandler) GetEventChannel(ctx context.Context, StopChan <- chan struct{}) <-chan events.Message {
if dh.DockerClient != nil {
event, _ := dh.DockerClient.Events(context.Background(), types.EventsOptions{})
return event
}
eventBuffer := make(chan events.Message, 256)

go func() {

eventStream, _ := dh.DockerClient.Events(ctx, events.ListOptions{})
defer close(eventBuffer)

for event := range eventStream {
select {
case eventBuffer <- event:
case <-ctx.Done():
return
case <-StopChan:
return
default:
kg.Warnf("Docker channel full.")
}
}
}()

return eventBuffer
}
return nil
}

Expand Down Expand Up @@ -753,7 +770,11 @@ func (dm *KubeArmorDaemon) MonitorDockerEvents() {

dm.Logger.Print("Started to monitor Docker events")

EventChan := Docker.GetEventChannel()
ctx, cancel := context.WithCancel(context.Background())
defer cancel()


EventChan := Docker.GetEventChannel(ctx, StopChan)

for {
select {
Expand Down