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

Jump to bottom

Fix kubearmor relay connection logic #766

Merged
merged 1 commit into from
Jul 5, 2023
Merged

Fix kubearmor relay connection logic #766

Show file tree
Hide file tree
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
13 changes: 6 additions & 7 deletions src/plugin/kubearmor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ import (
)

// Global Variable
var KubeArmorRelayLogs []*pb.Alert
var KubeArmorNetworkLogs []*pb.Alert
var KubeArmorRelayLogsMutex *sync.Mutex
var (
KubeArmorRelayLogs, KubeArmorNetworkLogs []*pb.Alert
KubeArmorRelayLogsMutex, KubeArmorFCLogsMutex *sync.Mutex

var KubeArmorFCLogs []*types.KnoxSystemLog
var KubeArmorFCLogsMutex *sync.Mutex
KubeArmorFCLogs []*types.KnoxSystemLog
KubeArmorRelayStarted = false
)

func generateProcessPaths(fromSrc []types.KnoxFromSource) []string {
var processpaths []string
Expand Down Expand Up @@ -381,8 +382,6 @@ func ignoreLogFromRelayWithNamespace(nsFilter, nsNotFilter []string, namespace s
return false
}

var KubeArmorRelayStarted = false

func StartKubeArmorRelay(StopChan chan struct{}, cfg types.ConfigKubeArmorRelay) {
if KubeArmorRelayStarted {
// log.Info().Msg("kubearmor relay already started")
Expand Down
44 changes: 23 additions & 21 deletions src/systempolicy/systemPolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,31 +1468,33 @@ func DiscoverSystemPolicyMain() {

func StartSystemLogRcvr() {
for {
if cfg.GetCfgSystemLogFrom() == "kubearmor" {
url := cluster.GetKubearmorRelayURL()
if url == "" {
log.Error().Msg("kubearmor-relay url not found, retrying...")
for i := 0; i < types.Maxtries; i++ {
time.Sleep(10 * time.Second)
url = cluster.GetKubearmorRelayURL()
if url != "" {
break
if !plugin.KubeArmorRelayStarted {
if cfg.GetCfgSystemLogFrom() == "kubearmor" {
url := cluster.GetKubearmorRelayURL()
if url == "" {
log.Error().Msg("kubearmor-relay url not found, retrying...")
for i := 0; i < types.Maxtries; i++ {
time.Sleep(10 * time.Second)
url = cluster.GetKubearmorRelayURL()
if url != "" {
break
}
}
}
if url == "" {
url = cfg.CurrentCfg.ConfigKubeArmorRelay.KubeArmorRelayURL
}
plugin.StartKubeArmorRelay(SystemStopChan, types.ConfigKubeArmorRelay{
KubeArmorRelayURL: url,
KubeArmorRelayPort: cfg.CurrentCfg.ConfigKubeArmorRelay.KubeArmorRelayPort,
})
} else if cfg.GetCfgSystemLogFrom() == "feed-consumer" {
fc.ConsumerMutex.Lock()
fc.StartConsumer()
fc.ConsumerMutex.Unlock()
}
if url == "" {
url = cfg.CurrentCfg.ConfigKubeArmorRelay.KubeArmorRelayURL
}
plugin.StartKubeArmorRelay(SystemStopChan, types.ConfigKubeArmorRelay{
KubeArmorRelayURL: url,
KubeArmorRelayPort: cfg.CurrentCfg.ConfigKubeArmorRelay.KubeArmorRelayPort,
})
} else if cfg.GetCfgSystemLogFrom() == "feed-consumer" {
fc.ConsumerMutex.Lock()
fc.StartConsumer()
fc.ConsumerMutex.Unlock()
time.Sleep(time.Second * 2)
}
time.Sleep(time.Second * 2)
}
}

Expand Down
Loading