Merge pull request #2432 from lebauce/remove-nsm

Remove nsm probe

analyzer/probes.go

@@ -38,7 +38,6 @@ import (
  "github.com/skydive-project/skydive/topology/probes/lxd"
  "github.com/skydive-project/skydive/topology/probes/netlink"
  "github.com/skydive-project/skydive/topology/probes/neutron"
- "github.com/skydive-project/skydive/topology/probes/nsm"
  "github.com/skydive-project/skydive/topology/probes/opencontrail"
  "github.com/skydive-project/skydive/topology/probes/ovn"
  "github.com/skydive-project/skydive/topology/probes/ovnk8s"
@@ -127,8 +126,6 @@ func NewTopologyProbeBundleFromConfig(g *graph.Graph) (*probe.Bundle, error) {
  handler, err = k8s.NewK8sProbe(g)
  case "istio":
  handler, err = istio.NewIstioProbe(g)
- case "nsm":
- handler, err = nsm.NewNsmProbe(g)
  default:
  logging.GetLogger().Errorf("unknown probe type: %s", t)
  continue

etc/skydive.yml.default

@@ -115,7 +115,6 @@ analyzer:
  probes:
  # - k8s
  # - istio
- # - nsm
  # - ovn
 
  k8s:

go.mod

@@ -37,11 +37,6 @@ require (
  github.com/mattn/goveralls v0.0.2
  github.com/mitchellh/mapstructure v1.4.1
  github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
- github.com/networkservicemesh/networkservicemesh/controlplane v0.3.0
- github.com/networkservicemesh/networkservicemesh/controlplane/api v0.3.0
- github.com/networkservicemesh/networkservicemesh/k8s v0.0.0-00010101000000-000000000000
- github.com/networkservicemesh/networkservicemesh/k8s/pkg/apis v0.3.0
- github.com/networkservicemesh/networkservicemesh/pkg v0.3.0
  github.com/newtools/ebpf v0.0.0-20190820102627-8b7eaed02eb9
  github.com/nimbess/nimbess-agent v0.0.0-20190919205041-4e6f317ac4fd
  github.com/nlewo/contrail-introspect-cli v0.0.0-20181003135217-0407b60f2edd
@@ -64,18 +59,18 @@ require (
  github.com/spf13/cobra v1.1.3
  github.com/spf13/pflag v1.0.5
  github.com/spf13/viper v1.7.0
- github.com/stretchr/testify v1.7.0
+ github.com/stretchr/testify v1.8.1
  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/vishvananda/netlink v1.0.0
  github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df
  github.com/weaveworks/tcptracer-bpf v0.0.0-20170817155301-e080bd747dc6
  go.etcd.io/etcd/client/v2 v2.305.0
- golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
- golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
- golang.org/x/tools v0.1.2
- google.golang.org/grpc v1.38.0
+ golang.org/x/net v0.17.0
+ golang.org/x/sys v0.13.0
+ golang.org/x/tools v0.6.0
+ google.golang.org/grpc v1.59.0
  gopkg.in/fsnotify/fsnotify.v1 v1.0.0-20180110053347-c2828203cd70
  gopkg.in/mcuadros/go-syslog.v2 v2.3.0
  gopkg.in/validator.v2 v2.0.0-20160201165114-3e4f037f12a1
@@ -88,8 +83,11 @@ require (
 )
 
 require (
- cloud.google.com/go v0.81.0 // indirect
- cloud.google.com/go/firestore v1.1.0 // indirect
+ cloud.google.com/go v0.110.8 // indirect
+ cloud.google.com/go/compute v1.23.1 // indirect
+ cloud.google.com/go/compute/metadata v0.2.3 // indirect
+ cloud.google.com/go/firestore v1.13.0 // indirect
+ cloud.google.com/go/longrunning v0.5.2 // indirect
  github.com/BurntSushi/toml v0.3.1 // indirect
  github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
  github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
@@ -171,10 +169,12 @@ require (
  github.com/gomatic/clock v0.0.0-20180923211445-dd56a80856b5 // indirect
  github.com/gomatic/funcmap v1.1.0 // indirect
  github.com/google/btree v1.0.1 // indirect
- github.com/google/go-cmp v0.5.5 // indirect
+ github.com/google/go-cmp v0.5.9 // indirect
  github.com/google/gofuzz v1.1.0 // indirect
- github.com/google/uuid v1.2.0 // indirect
- github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+ github.com/google/s2a-go v0.1.4 // indirect
+ github.com/google/uuid v1.3.1 // indirect
+ github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
+ github.com/googleapis/gax-go/v2 v2.12.0 // indirect
  github.com/googleapis/gnostic v0.4.1 // indirect
  github.com/gorilla/context v1.1.1 // indirect
  github.com/gorilla/handlers v1.5.1 // indirect
@@ -183,7 +183,6 @@ require (
  github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
  github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
  github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
- github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
  github.com/hashicorp/consul/api v1.3.0 // indirect
  github.com/hashicorp/errwrap v1.0.0 // indirect
  github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
@@ -203,7 +202,6 @@ require (
  github.com/jonboulle/clockwork v0.2.2 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.11 // indirect
- github.com/jstemmer/go-junit-report v0.9.1 // indirect
  github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5 // indirect
  github.com/juju/webbrowser v0.0.0-20160309143629-54b8c57083b4 // indirect
  github.com/julienschmidt/httprouter v1.3.0 // indirect
@@ -224,11 +222,8 @@ require (
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.1 // indirect
  github.com/nbutton23/zxcvbn-go v0.0.0-20171102151520-eafdab6b0663 // indirect
- github.com/networkservicemesh/networkservicemesh/sdk v0.3.0 // indirect
- github.com/networkservicemesh/networkservicemesh/utils v0.3.0 // indirect
  github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
- github.com/opentracing/opentracing-go v1.2.0 // indirect
  github.com/pelletier/go-toml v1.9.3 // indirect
  github.com/peterh/liner v1.2.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -243,15 +238,12 @@ require (
  github.com/sourcegraph/go-diff v0.5.1 // indirect
  github.com/spf13/afero v1.6.0 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
- github.com/spiffe/go-spiffe v0.0.0-20191104192205-d29ac0a1ba99 // indirect
  github.com/subosito/gotenv v1.2.0 // indirect
  github.com/tchap/zapext v1.0.0 // indirect
  github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec // indirect
  github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
  github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
  github.com/toqueteos/webbrowser v1.2.0 // indirect
- github.com/uber/jaeger-client-go v2.17.0+incompatible // indirect
- github.com/uber/jaeger-lib v2.1.1+incompatible // indirect
  github.com/ultraware/funlen v0.0.2 // indirect
  github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect
  github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
@@ -266,7 +258,7 @@ require (
  go.etcd.io/etcd/raft/v3 v3.5.0 // indirect
  go.etcd.io/etcd/server/v3 v3.5.0 // indirect
  go.mongodb.org/mongo-driver v1.1.2 // indirect
- go.opencensus.io v0.23.0 // indirect
+ go.opencensus.io v0.24.0 // indirect
  go.opentelemetry.io/contrib v0.20.0 // indirect
  go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
  go.opentelemetry.io/otel v0.20.0 // indirect
@@ -280,15 +272,18 @@ require (
  go.uber.org/atomic v1.7.0 // indirect
  go.uber.org/multierr v1.6.0 // indirect
  go.uber.org/zap v1.17.0 // indirect
- golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
- golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
- golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
- golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
- golang.org/x/text v0.3.5 // indirect
- golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
- google.golang.org/api v0.44.0 // indirect
+ golang.org/x/crypto v0.14.0 // indirect
+ golang.org/x/oauth2 v0.11.0 // indirect
+ golang.org/x/sync v0.3.0 // indirect
+ golang.org/x/term v0.13.0 // indirect
+ golang.org/x/text v0.13.0 // indirect
+ golang.org/x/time v0.3.0 // indirect
+ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+ google.golang.org/api v0.128.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
+ google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
  google.golang.org/protobuf v1.33.0 // indirect
  gopkg.in/errgo.v1 v1.0.1 // indirect
  gopkg.in/httprequest.v1 v1.2.0 // indirect
@@ -301,7 +296,7 @@ require (
  gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect
  gopkg.in/sourcemap.v1 v1.0.5 // indirect
  gopkg.in/urfave/cli.v2 v2.0.0-20170928224240-b2bf3c5abeb9 // indirect
- gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
  istio.io/gogo-genproto v0.0.0-20210113155706-4daf5697332f // indirect
  k8s.io/klog/v2 v2.8.0 // indirect
  k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
@@ -319,15 +314,6 @@ replace (
  github.com/digitalocean/go-libvirt => github.com/lebauce/go-libvirt v0.0.0-20190717144624-7799d804f7e4
  github.com/hashicorp/consul => github.com/hashicorp/consul v1.6.10
  github.com/mholt/caddy => github.com/caddyserver/caddy v0.11.5
- github.com/networkservicemesh/networkservicemesh => github.com/networkservicemesh/networkservicemesh v0.0.0-20210521142625-fea0424531de
- github.com/networkservicemesh/networkservicemesh/controlplane => github.com/networkservicemesh/networkservicemesh/controlplane v0.0.0-20210521142625-fea0424531de
- github.com/networkservicemesh/networkservicemesh/controlplane/api => github.com/networkservicemesh/networkservicemesh/controlplane/api v0.0.0-20210521142625-fea0424531de
- github.com/networkservicemesh/networkservicemesh/forwarder/api => github.com/networkservicemesh/networkservicemesh/forwarder/api v0.0.0-20210521142625-fea0424531de
- github.com/networkservicemesh/networkservicemesh/k8s => github.com/networkservicemesh/networkservicemesh/k8s v0.0.0-20210521142625-fea0424531de
- github.com/networkservicemesh/networkservicemesh/k8s/pkg/apis => github.com/networkservicemesh/networkservicemesh/k8s/pkg/apis v0.0.0-20210521142625-fea0424531de
- github.com/networkservicemesh/networkservicemesh/pkg => github.com/networkservicemesh/networkservicemesh/pkg v0.0.0-20210521142625-fea0424531de
- github.com/networkservicemesh/networkservicemesh/sdk => github.com/networkservicemesh/networkservicemesh/sdk v0.0.0-20210521142625-fea0424531de
- github.com/networkservicemesh/networkservicemesh/utils => github.com/networkservicemesh/networkservicemesh/utils v0.0.0-20210521142625-fea0424531de
  github.com/newtools/ebpf => github.com/nplanel/ebpf v0.0.0-20190918123742-99947faabce5
  github.com/nimbess/nimbess-agent => github.com/lebauce/nimbess-agent v0.0.0-20210903082218-878aee9e2258
  github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.3