Feature/snmp-lldp

agent/topology_probes.go

@@ -140,25 +140,31 @@ func NewTopologyProbeBundle(g *graph.Graph, hostNode *graph.Node) (*probe.Bundle
 	}
 
 	probeList := []string{"hardware"}
-	if runtime.GOOS == "linux" {
-		probeList = append(probeList, "netlink", "netns")
-	}
+	/*
+		* Do not add netlink by default
+		if runtime.GOOS == "linux" {
+			probeList = append(probeList, "netlink", "netns")
+		}
+	*/
 
 	probeList = append(probeList, config.GetStringSlice("agent.topology.probes")...)
 	logging.GetLogger().Infof("Topology probes: %v", probeList)
 
 	if runtime.GOOS == "linux" {
-		nlHandler, err := NewTopologyProbe("netlink", ctx, bundle)
-		if err != nil {
-			return nil, err
-		}
-		bundle.AddHandler("netlink", nlHandler)
-
-		nsHandler, err := NewTopologyProbe("netns", ctx, bundle)
-		if err != nil {
-			return nil, err
-		}
-		bundle.AddHandler("netns", nsHandler)
+		/*
+				* Do not add netlink by default
+					nlHandler, err := NewTopologyProbe("netlink", ctx, bundle)
+					if err != nil {
+						return nil, err
+					}
+					bundle.AddHandler("netlink", nlHandler)
+
+			nsHandler, err := NewTopologyProbe("netns", ctx, bundle)
+			if err != nil {
+				return nil, err
+			}
+			bundle.AddHandler("netns", nsHandler)
+		*/
 	}
 
 	for _, t := range probeList {

analyzer/probes.go

@@ -41,6 +41,9 @@ import (
 	"github.com/skydive-project/skydive/topology/probes/ovn"
 	"github.com/skydive-project/skydive/topology/probes/ovsdb"
 	"github.com/skydive-project/skydive/topology/probes/peering"
+	"github.com/skydive-project/skydive/topology/probes/proccon"
+	"github.com/skydive-project/skydive/topology/probes/procpeering"
+	"github.com/skydive-project/skydive/topology/probes/snmplldp"
 )
 
 func registerStaticProbes() {
@@ -54,6 +57,7 @@ func registerStaticProbes() {
 	ovsdb.Register()
 	libvirt.Register()
 	ovn.Register()
+	proccon.Register()
 }
 
 func registerPluginProbes() error {
@@ -121,6 +125,12 @@ func NewTopologyProbeBundleFromConfig(g *graph.Graph) (*probe.Bundle, error) {
 			handler, err = istio.NewIstioProbe(g)
 		case "nsm":
 			handler, err = nsm.NewNsmProbe(g)
+		case "proccon":
+			handler, err = proccon.NewProbe(g)
+		case "procpeering":
+			handler, err = procpeering.NewProbe(g)
+		case "snmplldp":
+			handler, err = snmplldp.NewProbe(g)
 		default:
 			logging.GetLogger().Errorf("unknown probe type: %s", t)
 			continue

analyzer/server.go

@@ -332,6 +332,7 @@ func NewServerFromConfig() (*Server, error) {
 	tr.AddTraversalExtension(ge.NewFlowTraversalExtension(tableClient, s.flowStorage))
 	tr.AddTraversalExtension(ge.NewSocketsTraversalExtension())
 	tr.AddTraversalExtension(ge.NewDescendantsTraversalExtension())
+	tr.AddTraversalExtension(ge.NewAscendantsTraversalExtension())
 	tr.AddTraversalExtension(ge.NewNextHopTraversalExtension())
 	tr.AddTraversalExtension(ge.NewGroupTraversalExtension())
 

etc/skydive.yml.default

@@ -117,6 +117,8 @@ analyzer:
       # - istio
       # - nsm
       # - ovn
+      # - procpeering
+      # - proccon
 
     k8s:
       # kubeconfig resolution order:
@@ -175,6 +177,33 @@ analyzer:
       # * unix:/var/run/ovn/ovnnb_db.sock
       # address: unix:/var/run/ovn/ovnnb_db.sock
 
+    # Probe to listen for outside metrics with network information about procs
+    proccon:
+      # Where does this probe listen for new data
+      listen: 0.0.0.0:4000
+
+      # Network information received by proccon that does not add new elements to Metadata.TCPConn or TCPListen
+      # does not produce a flush to the backend.
+      # To avoid leaving behind the backend, after this number of node revisions, the flush is done.
+      # The node.Revision field increments one for each modification in TCPConn or TCPListen.
+      # If the node receive info for both values, node.Revision will increment two times.
+      # Using revision_flush=1 will keep the backend synced to skydive, but at the expense of many writes.
+      # Using a big value could lost data in case of a restart.
+      # This value should be a trade-off between the interval of clients sending data the the garbage_collector.delete_duration
+      # Eg.: if clients send data each 5', assuming they always send conn+listen info, this will produce 2 updates each 5'.
+      # If we want to sync each two hours, we will set the value to 12*2/5=48
+      revision_flush: 48
+
+      # Clean old connections (items from Metadata.TCPConn and Metadata.TCPListen)
+      garbage_collector:
+        # How often garbage collector will run
+        # Format: https://golang.org/pkg/time/#ParseDuration
+        # Eg.: 2h, 20m, 3h45m
+        interval: 1h
+        # Network info older than this value will be deleted.
+        # Same format as "interval"
+        delete_duration: 3h
+
   replication:
     # debug: false
 

go.mod

@@ -29,11 +29,14 @@ require (
 	github.com/golang/protobuf v1.3.2
 	github.com/golangci/golangci-lint v1.18.0
 	github.com/gomatic/renderizer v1.0.1
+	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/google/gopacket v1.1.17
 	github.com/gophercloud/gophercloud v0.13.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
+	github.com/gosnmp/gosnmp v1.31.0 // indirect
 	github.com/gosuri/uitable v0.0.0-20160404203958-36ee7e946282 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.3
 	github.com/hydrogen18/stoppableListener v0.0.0-20151210151943-dadc9ccc400c
 	github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac // indirect
@@ -50,7 +53,6 @@ require (
 	github.com/lunixbochs/struc v0.0.0-20180408203800-02e4c2afbb2a
 	github.com/lxc/lxd v0.0.0-20200330183600-518f06676866
 	github.com/mailru/easyjson v0.7.6
-	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mattn/goveralls v0.0.2
 	github.com/mitchellh/mapstructure v1.3.3
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
@@ -79,17 +81,21 @@ require (
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.0
+	github.com/stretchr/testify v1.7.0
 	github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c
 	github.com/tebeka/go2xunit v1.4.10
 	github.com/tebeka/selenium v0.0.0-20170314201507-657e45ec600f
+	github.com/tinylib/msgp v1.1.0 // indirect
 	github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
 	github.com/vishvananda/netlink v1.0.0
 	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df
 	github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect
 	github.com/weaveworks/tcptracer-bpf v0.0.0-20170817155301-e080bd747dc6
 	golang.org/x/net v0.0.0-20201021035429-f5854403a974
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
 	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f
 	golang.org/x/tools v0.0.0-20210106214847-113979e3529a
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/grpc v1.23.1
 	gopkg.in/fsnotify/fsnotify.v1 v1.0.0-20180110053347-c2828203cd70
 	gopkg.in/macaroon-bakery.v2 v2.2.0 // indirect

graffiti/api/server/edge.go

@@ -90,7 +90,7 @@ func (h *EdgeAPIHandler) Create(resource rest.Resource, createOpts *rest.CreateO
 		graphEdge.UpdatedAt = graphEdge.CreatedAt
 	}
 	if graphEdge.Origin == "" {
-		graphEdge.Origin = h.g.GetOrigin()
+		graphEdge.Origin = graph.Origin(h.g.GetHost(), apiOrigin)
 	}
 	if graphEdge.Metadata == nil {
 		graphEdge.Metadata = graph.Metadata{}

graffiti/api/types/types.go

@@ -88,10 +88,18 @@ func (e *Edge) Validate() error {
 }
 
 // Node object
-// easyjson:json
 // swagger:model
 type Node graph.Node
 
+// UnmarshalJSON decodes types.Node using the custom graph.Node unmarshal which
+// uses MetadataDecoders
+func (n *Node) UnmarshalJSON(data []byte) error {
+	gNode := graph.Node(*n)
+	err := gNode.UnmarshalJSON(data)
+	*n = Node(gNode)
+	return err
+}
+
 // GetID returns the node ID
 func (n *Node) GetID() string {
 	return string(n.ID)