Use agent lib instead of ovnk-lib for NetworkEvents

go.mod

@@ -8,34 +8,26 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/json-iterator/go v1.1.12
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20241126140656-c95491e46334
+	github.com/netobserv/netobserv-ebpf-agent v1.7.0-community.0.20250220123714-ff37a09f6232
 	github.com/prometheus/client_golang v1.21.1
 	github.com/prometheus/common v0.62.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.10.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.32.1
+	k8s.io/api v0.32.2
 	k8s.io/apimachinery v0.32.2
-	k8s.io/client-go v0.32.1
+	k8s.io/client-go v0.32.2
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cenkalti/hub v1.0.1 // indirect
-	github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/containernetworking/cni v1.1.2 // indirect
-	github.com/containernetworking/plugins v1.2.0 // indirect
-	github.com/coreos/go-iptables v0.6.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -51,31 +43,24 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
-	github.com/ovn-org/libovsdb v0.7.1-0.20240820095311-ce1951614a20 // indirect
+	github.com/netobserv/flowlogs-pipeline v1.7.0-community.0.20241217113023-fa0540a1658e // indirect
+	github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20250215040159-dd2a70c928d3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/safchain/ethtool v0.3.1-0.20231027162144-83e5e0097c91 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/urfave/cli/v2 v2.27.2 // indirect
-	github.com/vishvananda/netlink v1.2.1-beta.2.0.20231024175852-77df5d35f725 // indirect
-	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.24.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/term v0.27.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
-	google.golang.org/protobuf v1.36.1 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
-	gopkg.in/gcfg.v1 v1.2.3 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect

pkg/decoders/network-events.go

@@ -3,8 +3,8 @@ package decoders
 import (
 	"encoding/json"
 
+	ovnutils "github.com/netobserv/netobserv-ebpf-agent/pkg/utils"
 	"github.com/netobserv/network-observability-console-plugin/pkg/model/fields"
-	ovnmodel "github.com/ovn-org/ovn-kubernetes/go-controller/observability-lib/model"
 	"github.com/sirupsen/logrus"
 )
 
@@ -16,48 +16,15 @@ func NetworkEventsToString(in string) string {
 		dlog.Errorf("Could not decode NetworkEvent: %v", err)
 		return in
 	}
-	if ne, found := line[fields.NetworkEvents]; found {
-		if neList, isList := ne.([]any); isList {
-			var messages []string
-			for _, item := range neList {
-				if neItem, isMap := item.(map[string]any); isMap {
-					messages = append(messages, networkEventItemToString(neItem))
-				}
-			}
-			line[fields.NetworkEvents] = messages
-			b, err := json.Marshal(line)
-			if err != nil {
-				dlog.Errorf("Could not reencode NetworkEvent: %v", err)
-				return in
-			}
-			return string(b)
+	events := ovnutils.NetworkEventsToStrings(line)
+	if events != nil {
+		line[fields.NetworkEvents] = events
+		b, err := json.Marshal(line)
+		if err != nil {
+			dlog.Errorf("Could not reencode NetworkEvent: %v", err)
+			return in
 		}
+		return string(b)
 	}
 	return in
 }
-
-func networkEventItemToString(in map[string]any) string {
-	if msg := getAsString(in, "Message"); msg != "" {
-		return msg
-	}
-	if feat := getAsString(in, "Feature"); feat == "acl" {
-		aclObj := ovnmodel.ACLEvent{
-			Action:    getAsString(in, "Action"),
-			Actor:     getAsString(in, "Type"),
-			Name:      getAsString(in, "Name"),
-			Namespace: getAsString(in, "Namespace"),
-			Direction: getAsString(in, "Direction"),
-		}
-		return aclObj.String()
-	}
-	return ""
-}
-
-func getAsString(in map[string]any, key string) string {
-	if anyV, hasKey := in[key]; hasKey {
-		if v, isStr := anyV.(string); isStr {
-			return v
-		}
-	}
-	return ""
-}