From 341a219568a7ccc2047acae22cbe8cd72e010701 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Tue, 10 Mar 2020 13:49:57 +0100 Subject: [PATCH] logging: move to graffiti --- agent/agent.go | 2 +- agent/flow_probes.go | 2 +- agent/host.go | 2 +- agent/topology_probes.go | 2 +- alert/server.go | 2 +- analyzer/probes.go | 2 +- analyzer/server.go | 2 +- analyzer/storage.go | 2 +- api/client/client.go | 2 +- api/server/capture.go | 2 +- api/server/config.go | 2 +- api/server/pcap.go | 3 ++- api/server/workflow.go | 2 +- cmd/agent/agent.go | 2 +- cmd/allinone/allinone.go | 2 +- cmd/analyzer/analyzer.go | 2 +- cmd/client/alert.go | 2 +- cmd/client/capture.go | 2 +- cmd/client/client.go | 2 +- cmd/client/common.go | 2 +- cmd/client/edge.go | 2 +- cmd/client/edgerule.go | 2 +- cmd/client/liner.go | 3 ++- cmd/client/node.go | 2 +- cmd/client/noderule.go | 2 +- cmd/client/packet_injector.go | 2 +- cmd/client/pcap.go | 2 +- cmd/client/query.go | 2 +- cmd/client/shell.go | 2 +- cmd/client/workflow.go | 2 +- cmd/seed/seed.go | 2 +- cmd/skydive/skydive.go | 2 +- config/logging.go | 2 +- config/rbac.go | 3 ++- contrib/jsonof/jsonof.go | 2 +- contrib/snort/snortSkydive.go | 2 +- ebpf/tests/tests.go | 2 +- flow/application.go | 2 +- flow/client.go | 2 +- flow/client/flow_client.go | 2 +- flow/flow.go | 2 +- flow/ondemand/client/client.go | 2 +- flow/pcap.go | 2 +- flow/probes/probes.go | 2 +- flow/probes/targets/erspan.go | 2 +- flow/probes/targets/netflow_v5.go | 2 +- flow/server.go | 3 ++- flow/server/flow_server.go | 2 +- flow/server/flow_subscriber_endpoint.go | 2 +- flow/storage/orientdb/orientdb.go | 2 +- flow/table.go | 2 +- flow/tcpassembler.go | 2 +- graffiti/api/rest/kv.go | 3 ++- graffiti/api/server/server.go | 2 +- graffiti/api/server/status.go | 3 ++- graffiti/api/server/topology.go | 3 ++- graffiti/cmd/hub.go | 5 +++-- graffiti/cmd/pod.go | 2 +- graffiti/common/forwarder.go | 2 +- graffiti/common/publisher_endpoint.go | 2 +- graffiti/common/subscriber_endpoint.go | 2 +- graffiti/etcd/client/client.go | 2 +- graffiti/etcd/client/election.go | 2 +- graffiti/etcd/server/server.go | 6 ++---- graffiti/graph/elasticsearch.go | 2 +- graffiti/graph/orientdb.go | 2 +- graffiti/hub/hub.go | 2 +- graffiti/hub/replication_endpoint.go | 2 +- {logging => graffiti/logging}/logging.go | 0 {logging => graffiti/logging}/no_syslog.go | 0 {logging => graffiti/logging}/syslog.go | 0 graffiti/ondemand/client/client.go | 2 +- graffiti/ondemand/server/server.go | 2 +- graffiti/pod/pod.go | 5 ++--- graffiti/seed/seed.go | 2 +- graffiti/storage/elasticsearch/client.go | 2 +- graffiti/storage/elasticsearch/rollindex.go | 2 +- graffiti/websocket/client.go | 2 +- graffiti/websocket/message.go | 6 +++--- graffiti/websocket/pool.go | 2 +- graffiti/websocket/server.go | 2 +- gremlin/traversal/flows.go | 2 +- http/server.go | 2 +- js/runtime.go | 2 +- netflow/agent.go | 2 +- openflow/client.go | 2 +- ovs/ovsdb/ovsdb.go | 2 +- packetinjector/client.go | 2 +- packetinjector/forge.go | 2 +- packetinjector/pcap.go | 4 ++-- packetinjector/server.go | 2 +- plugin/topology.go | 2 +- sflow/agent.go | 2 +- tests/flow_test.go | 2 +- tests/tests.go | 2 +- topology/enhancers/topology_manager.go | 2 +- topology/probes/k8s/cache.go | 2 +- topology/probes/k8s/cluster.go | 2 +- topology/probes/k8s/container.go | 2 +- topology/probes/k8s/graph.go | 2 +- topology/probes/k8s/probe.go | 2 +- topology/probes/netlink/sriov.go | 2 +- topology/probes/nsm/connection.go | 2 +- topology/probes/nsm/nsm.go | 2 +- topology/probes/ovn/ovn.go | 2 +- topology/probes/ovsdb/jsonof/ovs_rule_parser.go | 2 +- topology/probes/ovsdb/ovs_of_test.go | 2 +- topology/probes/peering/peering.go | 2 +- topology/probes/probe.go | 2 +- topology/probes/runc/runc_test.go | 2 +- topology/probes/wrapper.go | 2 +- topology/tid.go | 5 ++--- topology/topology.go | 2 +- ui/server.go | 3 ++- 114 files changed, 127 insertions(+), 122 deletions(-) rename {logging => graffiti/logging}/logging.go (100%) rename {logging => graffiti/logging}/no_syslog.go (100%) rename {logging => graffiti/logging}/syslog.go (100%) diff --git a/agent/agent.go b/agent/agent.go index 9e869ea081..4ea15e5aef 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -32,11 +32,11 @@ import ( "github.com/skydive-project/skydive/flow/client" ondemand "github.com/skydive-project/skydive/flow/ondemand/server" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/ondemand/server" "github.com/skydive-project/skydive/graffiti/pod" ws "github.com/skydive-project/skydive/graffiti/websocket" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/packetinjector" "github.com/skydive-project/skydive/probe" "github.com/skydive-project/skydive/topology" diff --git a/agent/flow_probes.go b/agent/flow_probes.go index 4b8000aafc..449c2a4fef 100644 --- a/agent/flow_probes.go +++ b/agent/flow_probes.go @@ -32,7 +32,7 @@ import ( "github.com/skydive-project/skydive/flow/probes/pcapsocket" "github.com/skydive-project/skydive/flow/probes/sflow" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/probe" ) diff --git a/agent/host.go b/agent/host.go index 642288942b..98562a11d0 100644 --- a/agent/host.go +++ b/agent/host.go @@ -28,7 +28,7 @@ import ( "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // createRootNode creates a graph.Node based on the host properties and aims to have an unique ID diff --git a/agent/topology_probes.go b/agent/topology_probes.go index c711716fe2..512893362a 100644 --- a/agent/topology_probes.go +++ b/agent/topology_probes.go @@ -23,7 +23,7 @@ import ( "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/plugin" "github.com/skydive-project/skydive/probe" tp "github.com/skydive-project/skydive/topology/probes" diff --git a/alert/server.go b/alert/server.go index c31a6838d0..17a9fba579 100644 --- a/alert/server.go +++ b/alert/server.go @@ -38,9 +38,9 @@ import ( etcd "github.com/skydive-project/skydive/graffiti/etcd/client" "github.com/skydive-project/skydive/graffiti/graph" "github.com/skydive-project/skydive/graffiti/graph/traversal" + "github.com/skydive-project/skydive/graffiti/logging" ws "github.com/skydive-project/skydive/graffiti/websocket" "github.com/skydive-project/skydive/js" - "github.com/skydive-project/skydive/logging" ) const ( diff --git a/analyzer/probes.go b/analyzer/probes.go index 324d0498a8..f3b51a2f74 100644 --- a/analyzer/probes.go +++ b/analyzer/probes.go @@ -21,7 +21,7 @@ import ( "github.com/skydive-project/skydive/config" fp "github.com/skydive-project/skydive/flow/probes" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/packetinjector" "github.com/skydive-project/skydive/plugin" "github.com/skydive-project/skydive/probe" diff --git a/analyzer/server.go b/analyzer/server.go index 6664cc93f1..449c0eeac5 100644 --- a/analyzer/server.go +++ b/analyzer/server.go @@ -38,12 +38,12 @@ import ( etcdserver "github.com/skydive-project/skydive/graffiti/etcd/server" "github.com/skydive-project/skydive/graffiti/graph" "github.com/skydive-project/skydive/graffiti/hub" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/ondemand/client" "github.com/skydive-project/skydive/graffiti/service" ws "github.com/skydive-project/skydive/graffiti/websocket" ge "github.com/skydive-project/skydive/gremlin/traversal" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/packetinjector" "github.com/skydive-project/skydive/probe" "github.com/skydive-project/skydive/sflow" diff --git a/analyzer/storage.go b/analyzer/storage.go index 04b0caf977..26e249cde2 100644 --- a/analyzer/storage.go +++ b/analyzer/storage.go @@ -26,8 +26,8 @@ import ( "github.com/skydive-project/skydive/flow/storage/orientdb" etcd "github.com/skydive-project/skydive/graffiti/etcd/client" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" es "github.com/skydive-project/skydive/graffiti/storage/elasticsearch" - "github.com/skydive-project/skydive/logging" ) // NewESConfig returns a new elasticsearch configuration for the given backend name diff --git a/api/client/client.go b/api/client/client.go index c895c80a6a..10b54f6a60 100644 --- a/api/client/client.go +++ b/api/client/client.go @@ -19,8 +19,8 @@ package client import ( "github.com/skydive-project/skydive/config" + "github.com/skydive-project/skydive/graffiti/logging" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // NewCrudClientFromConfig creates a new REST client on /api diff --git a/api/server/capture.go b/api/server/capture.go index 8b7218c49d..38af942da6 100644 --- a/api/server/capture.go +++ b/api/server/capture.go @@ -29,9 +29,9 @@ import ( "github.com/skydive-project/skydive/graffiti/api/rest" api "github.com/skydive-project/skydive/graffiti/api/server" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" ge "github.com/skydive-project/skydive/gremlin/traversal" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // CaptureResourceHandler describes a capture ressouce handler diff --git a/api/server/config.go b/api/server/config.go index 96d8b5d5b5..8b86422502 100644 --- a/api/server/config.go +++ b/api/server/config.go @@ -9,9 +9,9 @@ import ( "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/rbac" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) type configAPI struct { diff --git a/api/server/pcap.go b/api/server/pcap.go index 35af90e816..cf7823568c 100644 --- a/api/server/pcap.go +++ b/api/server/pcap.go @@ -22,12 +22,13 @@ import ( "time" auth "github.com/abbot/go-http-auth" + "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/flow" "github.com/skydive-project/skydive/flow/storage" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/rbac" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // PcapAPI exposes the pcap injector API diff --git a/api/server/workflow.go b/api/server/workflow.go index 5ef2c96b0d..22fff95e4b 100644 --- a/api/server/workflow.go +++ b/api/server/workflow.go @@ -28,8 +28,8 @@ import ( "github.com/skydive-project/skydive/api/types" "github.com/skydive-project/skydive/graffiti/api/rest" api "github.com/skydive-project/skydive/graffiti/api/server" + "github.com/skydive-project/skydive/graffiti/logging" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/statics" ) diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go index f6074f1efd..eb4cca0b13 100644 --- a/cmd/agent/agent.go +++ b/cmd/agent/agent.go @@ -24,7 +24,7 @@ import ( "github.com/skydive-project/skydive/agent" "github.com/skydive-project/skydive/config" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/version" "github.com/spf13/cobra" diff --git a/cmd/allinone/allinone.go b/cmd/allinone/allinone.go index 980d8e9f28..99e191ab22 100644 --- a/cmd/allinone/allinone.go +++ b/cmd/allinone/allinone.go @@ -36,9 +36,9 @@ import ( "github.com/skydive-project/skydive/cmd" cmdconfig "github.com/skydive-project/skydive/cmd/config" "github.com/skydive-project/skydive/config" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) var ( diff --git a/cmd/analyzer/analyzer.go b/cmd/analyzer/analyzer.go index a38f2dc215..10a7718427 100644 --- a/cmd/analyzer/analyzer.go +++ b/cmd/analyzer/analyzer.go @@ -25,7 +25,7 @@ import ( "github.com/skydive-project/skydive/analyzer" "github.com/skydive-project/skydive/config" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/version" "github.com/spf13/cobra" diff --git a/cmd/client/alert.go b/cmd/client/alert.go index 812be395b3..7e8686ec77 100644 --- a/cmd/client/alert.go +++ b/cmd/client/alert.go @@ -22,7 +22,7 @@ import ( "github.com/skydive-project/skydive/api/client" "github.com/skydive-project/skydive/api/types" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/validator" "github.com/spf13/cobra" diff --git a/cmd/client/capture.go b/cmd/client/capture.go index aa3d657fb0..754a0ddaf9 100644 --- a/cmd/client/capture.go +++ b/cmd/client/capture.go @@ -27,8 +27,8 @@ import ( api "github.com/skydive-project/skydive/api/types" "github.com/skydive-project/skydive/flow" "github.com/skydive-project/skydive/flow/probes" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/validator" "github.com/spf13/cobra" ) diff --git a/cmd/client/client.go b/cmd/client/client.go index 30d129d668..0cf7e193c1 100644 --- a/cmd/client/client.go +++ b/cmd/client/client.go @@ -21,7 +21,7 @@ import ( "os" "github.com/skydive-project/skydive/config" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/spf13/cobra" ) diff --git a/cmd/client/common.go b/cmd/client/common.go index 12cb5b806d..82ac4fac31 100644 --- a/cmd/client/common.go +++ b/cmd/client/common.go @@ -22,8 +22,8 @@ import ( "fmt" "os" + "github.com/skydive-project/skydive/graffiti/logging" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // AuthenticationOpts Authentication options diff --git a/cmd/client/edge.go b/cmd/client/edge.go index 3536c6eaa6..4e6ed4be8e 100644 --- a/cmd/client/edge.go +++ b/cmd/client/edge.go @@ -27,7 +27,7 @@ import ( api "github.com/skydive-project/skydive/api/types" "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" usertopology "github.com/skydive-project/skydive/topology/enhancers" "github.com/skydive-project/skydive/validator" diff --git a/cmd/client/edgerule.go b/cmd/client/edgerule.go index 1e28a62078..20c52400a3 100644 --- a/cmd/client/edgerule.go +++ b/cmd/client/edgerule.go @@ -24,7 +24,7 @@ import ( "github.com/skydive-project/skydive/api/client" api "github.com/skydive-project/skydive/api/types" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" usertopology "github.com/skydive-project/skydive/topology/enhancers" "github.com/skydive-project/skydive/validator" diff --git a/cmd/client/liner.go b/cmd/client/liner.go index 259e5187dd..11106a9e88 100644 --- a/cmd/client/liner.go +++ b/cmd/client/liner.go @@ -25,7 +25,8 @@ import ( "text/scanner" "github.com/peterh/liner" - "github.com/skydive-project/skydive/logging" + + "github.com/skydive-project/skydive/graffiti/logging" ) const ( diff --git a/cmd/client/node.go b/cmd/client/node.go index 19446b7f0b..82271f38dc 100644 --- a/cmd/client/node.go +++ b/cmd/client/node.go @@ -27,7 +27,7 @@ import ( api "github.com/skydive-project/skydive/api/types" "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" usertopology "github.com/skydive-project/skydive/topology/enhancers" "github.com/skydive-project/skydive/validator" diff --git a/cmd/client/noderule.go b/cmd/client/noderule.go index 383481a76a..32686b0c2b 100644 --- a/cmd/client/noderule.go +++ b/cmd/client/noderule.go @@ -25,7 +25,7 @@ import ( "github.com/skydive-project/skydive/api/client" api "github.com/skydive-project/skydive/api/types" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" usertopology "github.com/skydive-project/skydive/topology/enhancers" "github.com/skydive-project/skydive/validator" diff --git a/cmd/client/packet_injector.go b/cmd/client/packet_injector.go index aa55ab6852..da6093d27c 100644 --- a/cmd/client/packet_injector.go +++ b/cmd/client/packet_injector.go @@ -26,8 +26,8 @@ import ( "github.com/skydive-project/skydive/api/client" api "github.com/skydive-project/skydive/api/types" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/packetinjector" pi "github.com/skydive-project/skydive/packetinjector" "github.com/skydive-project/skydive/validator" diff --git a/cmd/client/pcap.go b/cmd/client/pcap.go index 64e53717af..e37ed1dbbb 100644 --- a/cmd/client/pcap.go +++ b/cmd/client/pcap.go @@ -24,7 +24,7 @@ import ( "os" "github.com/skydive-project/skydive/api/client" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/spf13/cobra" ) diff --git a/cmd/client/query.go b/cmd/client/query.go index 75ec406b50..b5543fec50 100644 --- a/cmd/client/query.go +++ b/cmd/client/query.go @@ -29,7 +29,7 @@ import ( "github.com/spf13/cobra" "github.com/skydive-project/skydive/api/client" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // QueryCmd skydive topology query command diff --git a/cmd/client/shell.go b/cmd/client/shell.go index ba80c3196c..3e153a35e1 100644 --- a/cmd/client/shell.go +++ b/cmd/client/shell.go @@ -28,9 +28,9 @@ import ( "github.com/spf13/cobra" "github.com/skydive-project/skydive/api/client" + "github.com/skydive-project/skydive/graffiti/logging" shttp "github.com/skydive-project/skydive/http" "github.com/skydive-project/skydive/js" - "github.com/skydive-project/skydive/logging" ) var ( diff --git a/cmd/client/workflow.go b/cmd/client/workflow.go index 25d1fce5c7..3ac49030a4 100644 --- a/cmd/client/workflow.go +++ b/cmd/client/workflow.go @@ -27,7 +27,7 @@ import ( "github.com/skydive-project/skydive/api/client" "github.com/skydive-project/skydive/api/types" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/validator" "github.com/spf13/cobra" diff --git a/cmd/seed/seed.go b/cmd/seed/seed.go index 836abe715f..8b07658d3d 100644 --- a/cmd/seed/seed.go +++ b/cmd/seed/seed.go @@ -25,10 +25,10 @@ import ( "github.com/skydive-project/skydive/agent" "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/seed" "github.com/skydive-project/skydive/graffiti/websocket" "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/probe" tp "github.com/skydive-project/skydive/topology/probes" "github.com/skydive-project/skydive/version" diff --git a/cmd/skydive/skydive.go b/cmd/skydive/skydive.go index d6b8c1c547..1ff23c5fd0 100644 --- a/cmd/skydive/skydive.go +++ b/cmd/skydive/skydive.go @@ -32,7 +32,7 @@ import ( "github.com/skydive-project/skydive/cmd/injector" "github.com/skydive-project/skydive/cmd/seed" "github.com/skydive-project/skydive/cmd/version" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/spf13/cobra" ) diff --git a/config/logging.go b/config/logging.go index 6700333839..48a28ff718 100644 --- a/config/logging.go +++ b/config/logging.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // InitLogging set up logging based on the section "logging" of diff --git a/config/rbac.go b/config/rbac.go index d990a36d5e..6d707546f5 100644 --- a/config/rbac.go +++ b/config/rbac.go @@ -28,8 +28,9 @@ import ( "github.com/casbin/casbin/model" "github.com/casbin/casbin/persist" etcd "github.com/coreos/etcd/client" + + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/rbac" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/statics" ) diff --git a/contrib/jsonof/jsonof.go b/contrib/jsonof/jsonof.go index 2dd77bde6f..6ae5d935ff 100644 --- a/contrib/jsonof/jsonof.go +++ b/contrib/jsonof/jsonof.go @@ -24,7 +24,7 @@ import ( "fmt" "os" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/topology/probes/ovsdb/jsonof" ) diff --git a/contrib/snort/snortSkydive.go b/contrib/snort/snortSkydive.go index 003b9a5395..9903fb354d 100644 --- a/contrib/snort/snortSkydive.go +++ b/contrib/snort/snortSkydive.go @@ -37,8 +37,8 @@ import ( "github.com/skydive-project/skydive/common" "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/flow" + "github.com/skydive-project/skydive/graffiti/logging" es "github.com/skydive-project/skydive/graffiti/storage/elasticsearch" - "github.com/skydive-project/skydive/logging" ) // sudo -E /usr/bin/snort -A cmg -c /etc/snort/snort.lua -R snort3-community-rules/snort3-community.rules -i br-gre -X 2>/dev/null | go run contrib/snort/snortSkydive.go diff --git a/ebpf/tests/tests.go b/ebpf/tests/tests.go index 2273e0bce3..2752a06cca 100644 --- a/ebpf/tests/tests.go +++ b/ebpf/tests/tests.go @@ -34,7 +34,7 @@ import ( "github.com/skydive-project/skydive/flow" "github.com/skydive-project/skydive/flow/probes/ebpf" "github.com/skydive-project/skydive/graffiti/filters" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // #cgo CFLAGS: -I../ diff --git a/flow/application.go b/flow/application.go index c9f0833bb9..d2b246439b 100644 --- a/flow/application.go +++ b/flow/application.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/skydive-project/skydive/config" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // ApplicationPortMap maps UDP and TCP port numbers to service names diff --git a/flow/client.go b/flow/client.go index ca1eb247ed..69eaa8b4e6 100644 --- a/flow/client.go +++ b/flow/client.go @@ -23,8 +23,8 @@ import ( "github.com/skydive-project/skydive/common" "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/graffiti/filters" + "github.com/skydive-project/skydive/graffiti/logging" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/topology" ) diff --git a/flow/client/flow_client.go b/flow/client/flow_client.go index b0aca55421..710b5858e6 100644 --- a/flow/client/flow_client.go +++ b/flow/client/flow_client.go @@ -29,8 +29,8 @@ import ( "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/flow" + "github.com/skydive-project/skydive/graffiti/logging" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" ) // FlowClientPool describes a flow client pool. diff --git a/flow/flow.go b/flow/flow.go index 518fe70409..b473f2a586 100644 --- a/flow/flow.go +++ b/flow/flow.go @@ -37,7 +37,7 @@ import ( "github.com/skydive-project/skydive/config" fl "github.com/skydive-project/skydive/flow/layers" "github.com/skydive-project/skydive/graffiti/getter" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) var ( diff --git a/flow/ondemand/client/client.go b/flow/ondemand/client/client.go index b04828b946..57f42f103f 100644 --- a/flow/ondemand/client/client.go +++ b/flow/ondemand/client/client.go @@ -26,11 +26,11 @@ import ( "github.com/skydive-project/skydive/graffiti/api/rest" etcd "github.com/skydive-project/skydive/graffiti/etcd/client" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/ondemand/client" ws "github.com/skydive-project/skydive/graffiti/websocket" "github.com/skydive-project/skydive/gremlin" ge "github.com/skydive-project/skydive/gremlin/traversal" - "github.com/skydive-project/skydive/logging" ) type onDemandFlowHandler struct { diff --git a/flow/pcap.go b/flow/pcap.go index 57bfa928d9..56e886db9e 100644 --- a/flow/pcap.go +++ b/flow/pcap.go @@ -26,8 +26,8 @@ import ( "github.com/google/gopacket/layers" "github.com/google/gopacket/pcapgo" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" ) // PcapWriter provides helpers on top of gopacket pcap to write pcap files. diff --git a/flow/probes/probes.go b/flow/probes/probes.go index b5c0c5e840..4bd929eef7 100644 --- a/flow/probes/probes.go +++ b/flow/probes/probes.go @@ -29,8 +29,8 @@ import ( "github.com/skydive-project/skydive/flow" "github.com/skydive-project/skydive/graffiti/getter" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/ondemand" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/probe" ) diff --git a/flow/probes/targets/erspan.go b/flow/probes/targets/erspan.go index 0cc12f0246..52ab976299 100644 --- a/flow/probes/targets/erspan.go +++ b/flow/probes/targets/erspan.go @@ -62,7 +62,7 @@ import ( "github.com/skydive-project/skydive/api/types" "github.com/skydive-project/skydive/flow" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // ERSpanTarget defines a ERSpanTarget target diff --git a/flow/probes/targets/netflow_v5.go b/flow/probes/targets/netflow_v5.go index 537c4d476d..7467bc563a 100644 --- a/flow/probes/targets/netflow_v5.go +++ b/flow/probes/targets/netflow_v5.go @@ -32,7 +32,7 @@ import ( "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/flow" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // NetFlowV5Target defines a NetFlow v5 target diff --git a/flow/server.go b/flow/server.go index 46e294f759..a9e95a3b5e 100644 --- a/flow/server.go +++ b/flow/server.go @@ -19,8 +19,9 @@ package flow import ( "github.com/golang/protobuf/proto" + + "github.com/skydive-project/skydive/graffiti/logging" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" ) // Namespace "Flow" diff --git a/flow/server/flow_server.go b/flow/server/flow_server.go index 7e74262a3a..5928b4e300 100644 --- a/flow/server/flow_server.go +++ b/flow/server/flow_server.go @@ -30,10 +30,10 @@ import ( "github.com/skydive-project/skydive/flow" "github.com/skydive-project/skydive/flow/storage" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" ws "github.com/skydive-project/skydive/graffiti/websocket" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/probe" ) diff --git a/flow/server/flow_subscriber_endpoint.go b/flow/server/flow_subscriber_endpoint.go index c9155b9562..0afce832c7 100644 --- a/flow/server/flow_subscriber_endpoint.go +++ b/flow/server/flow_subscriber_endpoint.go @@ -21,8 +21,8 @@ import ( "github.com/safchain/insanelock" "github.com/skydive-project/skydive/flow" + "github.com/skydive-project/skydive/graffiti/logging" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" ) // FlowSubscriberEndpoint sends all the flows to its subscribers. diff --git a/flow/storage/orientdb/orientdb.go b/flow/storage/orientdb/orientdb.go index 6ddd0b36a1..3791938bc3 100644 --- a/flow/storage/orientdb/orientdb.go +++ b/flow/storage/orientdb/orientdb.go @@ -30,8 +30,8 @@ import ( "github.com/skydive-project/skydive/flow" fl "github.com/skydive-project/skydive/flow/layers" "github.com/skydive-project/skydive/graffiti/filters" + "github.com/skydive-project/skydive/graffiti/logging" orient "github.com/skydive-project/skydive/graffiti/storage/orientdb" - "github.com/skydive-project/skydive/logging" ) // Storage describes a OrientDB database client diff --git a/flow/table.go b/flow/table.go index 81e00e7c24..26054cf237 100644 --- a/flow/table.go +++ b/flow/table.go @@ -30,8 +30,8 @@ import ( "github.com/skydive-project/skydive/common" "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/graffiti/filters" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" ) // HoldTimeoutMilliseconds is the number of milliseconds for holding ended flows before they get deleted from the flow table diff --git a/flow/tcpassembler.go b/flow/tcpassembler.go index 999d1d4517..b3445c9c5e 100644 --- a/flow/tcpassembler.go +++ b/flow/tcpassembler.go @@ -25,7 +25,7 @@ import ( "github.com/google/gopacket/layers" "github.com/google/gopacket/tcpassembly" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // TCPAssembler defines a tcp reassembler diff --git a/graffiti/api/rest/kv.go b/graffiti/api/rest/kv.go index c21fcc5bad..8d9ee3566e 100644 --- a/graffiti/api/rest/kv.go +++ b/graffiti/api/rest/kv.go @@ -28,7 +28,8 @@ import ( etcd "github.com/coreos/etcd/client" uuid "github.com/nu7hatch/gouuid" - "github.com/skydive-project/skydive/logging" + + "github.com/skydive-project/skydive/graffiti/logging" ) // BasicAPIHandler basic implementation of an Handler, should be used as embedded struct diff --git a/graffiti/api/server/server.go b/graffiti/api/server/server.go index 32881add65..c21a631e1f 100644 --- a/graffiti/api/server/server.go +++ b/graffiti/api/server/server.go @@ -50,10 +50,10 @@ import ( yaml "gopkg.in/yaml.v2" "github.com/skydive-project/skydive/graffiti/api/rest" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/rbac" "github.com/skydive-project/skydive/graffiti/service" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // Validator is the interface to implement to validate REST resources diff --git a/graffiti/api/server/status.go b/graffiti/api/server/status.go index ef7c3f2618..563e360717 100644 --- a/graffiti/api/server/status.go +++ b/graffiti/api/server/status.go @@ -22,9 +22,10 @@ import ( "net/http" auth "github.com/abbot/go-http-auth" + + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/rbac" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // StatusReporter is the interface to report the status of a service diff --git a/graffiti/api/server/topology.go b/graffiti/api/server/topology.go index bf5dee357f..915ae1e246 100644 --- a/graffiti/api/server/topology.go +++ b/graffiti/api/server/topology.go @@ -27,11 +27,12 @@ import ( "strings" auth "github.com/abbot/go-http-auth" + "github.com/skydive-project/skydive/graffiti/graph" "github.com/skydive-project/skydive/graffiti/graph/traversal" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/rbac" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // TopologyMarshaller is used to output a gremlin step diff --git a/graffiti/cmd/hub.go b/graffiti/cmd/hub.go index 2dff28a800..49413b4765 100644 --- a/graffiti/cmd/hub.go +++ b/graffiti/cmd/hub.go @@ -24,16 +24,17 @@ import ( "syscall" "time" + "github.com/spf13/cobra" + api "github.com/skydive-project/skydive/graffiti/api/server" etcdclient "github.com/skydive-project/skydive/graffiti/etcd/client" etcdserver "github.com/skydive-project/skydive/graffiti/etcd/server" "github.com/skydive-project/skydive/graffiti/graph" "github.com/skydive-project/skydive/graffiti/hub" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" "github.com/skydive-project/skydive/graffiti/websocket" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" - "github.com/spf13/cobra" ) const ( diff --git a/graffiti/cmd/pod.go b/graffiti/cmd/pod.go index 36be2b0f45..fc7a441e3e 100644 --- a/graffiti/cmd/pod.go +++ b/graffiti/cmd/pod.go @@ -28,11 +28,11 @@ import ( "github.com/spf13/cobra" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/pod" "github.com/skydive-project/skydive/graffiti/service" "github.com/skydive-project/skydive/graffiti/websocket" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) const serviceType = service.Type("Pod") diff --git a/graffiti/common/forwarder.go b/graffiti/common/forwarder.go index 5c3961ea9b..3daf1f0223 100644 --- a/graffiti/common/forwarder.go +++ b/graffiti/common/forwarder.go @@ -19,9 +19,9 @@ package common import ( "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/messages" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" ) // Forwarder forwards the topology to only one master server. diff --git a/graffiti/common/publisher_endpoint.go b/graffiti/common/publisher_endpoint.go index 6c87ce97e4..7699750453 100644 --- a/graffiti/common/publisher_endpoint.go +++ b/graffiti/common/publisher_endpoint.go @@ -24,9 +24,9 @@ import ( "github.com/skydive-project/skydive/graffiti/api/server" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/messages" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" ) // PersistencePolicy defines Persistent policy for publishers diff --git a/graffiti/common/subscriber_endpoint.go b/graffiti/common/subscriber_endpoint.go index f1b4869fee..7c5b08f587 100644 --- a/graffiti/common/subscriber_endpoint.go +++ b/graffiti/common/subscriber_endpoint.go @@ -27,9 +27,9 @@ import ( "github.com/skydive-project/skydive/graffiti/graph" "github.com/skydive-project/skydive/graffiti/graph/traversal" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/messages" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" ) type subscriber struct { diff --git a/graffiti/etcd/client/client.go b/graffiti/etcd/client/client.go index 70bf3ffbb8..b70ef58e50 100644 --- a/graffiti/etcd/client/client.go +++ b/graffiti/etcd/client/client.go @@ -26,8 +26,8 @@ import ( etcd "github.com/coreos/etcd/client" "github.com/skydive-project/skydive/common" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" ) // Client defaults diff --git a/graffiti/etcd/client/election.go b/graffiti/etcd/client/election.go index c41e6e511e..bbc3dcc628 100644 --- a/graffiti/etcd/client/election.go +++ b/graffiti/etcd/client/election.go @@ -26,8 +26,8 @@ import ( "golang.org/x/net/context" "github.com/skydive-project/skydive/common" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" ) const ( diff --git a/graffiti/etcd/server/server.go b/graffiti/etcd/server/server.go index 935cc0b7b3..ac75292a81 100644 --- a/graffiti/etcd/server/server.go +++ b/graffiti/etcd/server/server.go @@ -26,14 +26,12 @@ import ( "time" "github.com/coreos/etcd/client" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/pkg/osutil" + "github.com/coreos/etcd/pkg/types" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" ) const ( diff --git a/graffiti/graph/elasticsearch.go b/graffiti/graph/elasticsearch.go index 24ce5fffa1..49be9e577c 100644 --- a/graffiti/graph/elasticsearch.go +++ b/graffiti/graph/elasticsearch.go @@ -27,8 +27,8 @@ import ( "github.com/skydive-project/skydive/common" "github.com/skydive-project/skydive/graffiti/filters" + "github.com/skydive-project/skydive/graffiti/logging" es "github.com/skydive-project/skydive/graffiti/storage/elasticsearch" - "github.com/skydive-project/skydive/logging" ) // graphElementMapping elasticsearch db mapping scheme diff --git a/graffiti/graph/orientdb.go b/graffiti/graph/orientdb.go index fee978604f..8799ea40c8 100644 --- a/graffiti/graph/orientdb.go +++ b/graffiti/graph/orientdb.go @@ -24,8 +24,8 @@ import ( "github.com/skydive-project/skydive/common" "github.com/skydive-project/skydive/graffiti/filters" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/storage/orientdb" - "github.com/skydive-project/skydive/logging" ) // OrientDBBackend describes an OrientDB backend diff --git a/graffiti/hub/hub.go b/graffiti/hub/hub.go index 6bcd6f9d02..192ab1cbf7 100644 --- a/graffiti/hub/hub.go +++ b/graffiti/hub/hub.go @@ -27,11 +27,11 @@ import ( etcdserver "github.com/skydive-project/skydive/graffiti/etcd/server" "github.com/skydive-project/skydive/graffiti/graph" "github.com/skydive-project/skydive/graffiti/graph/traversal" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/schema" "github.com/skydive-project/skydive/graffiti/service" "github.com/skydive-project/skydive/graffiti/websocket" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // Opts Hub options diff --git a/graffiti/hub/replication_endpoint.go b/graffiti/hub/replication_endpoint.go index 6b54141992..b8bccdd373 100644 --- a/graffiti/hub/replication_endpoint.go +++ b/graffiti/hub/replication_endpoint.go @@ -27,11 +27,11 @@ import ( gcommon "github.com/skydive-project/skydive/graffiti/common" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/messages" "github.com/skydive-project/skydive/graffiti/service" ws "github.com/skydive-project/skydive/graffiti/websocket" "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // ReplicatorPeer is a remote connection to another Graph server. Only modification diff --git a/logging/logging.go b/graffiti/logging/logging.go similarity index 100% rename from logging/logging.go rename to graffiti/logging/logging.go diff --git a/logging/no_syslog.go b/graffiti/logging/no_syslog.go similarity index 100% rename from logging/no_syslog.go rename to graffiti/logging/no_syslog.go diff --git a/logging/syslog.go b/graffiti/logging/syslog.go similarity index 100% rename from logging/syslog.go rename to graffiti/logging/syslog.go diff --git a/graffiti/ondemand/client/client.go b/graffiti/ondemand/client/client.go index 7d55b7a9a8..e729e34f8d 100644 --- a/graffiti/ondemand/client/client.go +++ b/graffiti/ondemand/client/client.go @@ -32,9 +32,9 @@ import ( etcd "github.com/skydive-project/skydive/graffiti/etcd/client" "github.com/skydive-project/skydive/graffiti/filters" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/ondemand" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" ) // OnDemandNodeResource describes an association between a graph diff --git a/graffiti/ondemand/server/server.go b/graffiti/ondemand/server/server.go index 22e9eb6b88..178ef28c35 100644 --- a/graffiti/ondemand/server/server.go +++ b/graffiti/ondemand/server/server.go @@ -27,9 +27,9 @@ import ( "github.com/skydive-project/skydive/graffiti/api/rest" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/ondemand" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" ) type activeTask struct { diff --git a/graffiti/pod/pod.go b/graffiti/pod/pod.go index 09756574e7..1559025d87 100644 --- a/graffiti/pod/pod.go +++ b/graffiti/pod/pod.go @@ -24,12 +24,11 @@ import ( "github.com/skydive-project/skydive/graffiti/common" "github.com/skydive-project/skydive/graffiti/graph" "github.com/skydive-project/skydive/graffiti/graph/traversal" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/schema" "github.com/skydive-project/skydive/graffiti/service" "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/http" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) // Opts defines pod server options @@ -159,7 +158,7 @@ func NewPod(id string, serviceType service.Type, listen string, podEndpoint stri clientOpts := opts.WebsocketClientOpts clientOpts.Protocol = websocket.ProtobufProtocol for _, sa := range opts.Hubs { - url := http.MakeURL("ws", sa.Addr, sa.Port, podEndpoint, clientOpts.TLSConfig != nil) + url := shttp.MakeURL("ws", sa.Addr, sa.Port, podEndpoint, clientOpts.TLSConfig != nil) client := websocket.NewClient(id, serviceType, url, clientOpts) clientPool.AddClient(client) } diff --git a/graffiti/seed/seed.go b/graffiti/seed/seed.go index fadf0354bf..22e9b7df79 100644 --- a/graffiti/seed/seed.go +++ b/graffiti/seed/seed.go @@ -24,10 +24,10 @@ import ( fw "github.com/skydive-project/skydive/graffiti/common" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/messages" "github.com/skydive-project/skydive/graffiti/service" ws "github.com/skydive-project/skydive/graffiti/websocket" - "github.com/skydive-project/skydive/logging" ) // Service defines the seed service type diff --git a/graffiti/storage/elasticsearch/client.go b/graffiti/storage/elasticsearch/client.go index a7998fea9c..0594c0b0a5 100644 --- a/graffiti/storage/elasticsearch/client.go +++ b/graffiti/storage/elasticsearch/client.go @@ -33,8 +33,8 @@ import ( "github.com/skydive-project/skydive/common" "github.com/skydive-project/skydive/graffiti/filters" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/storage" - "github.com/skydive-project/skydive/logging" ) const ( diff --git a/graffiti/storage/elasticsearch/rollindex.go b/graffiti/storage/elasticsearch/rollindex.go index 5f350e31ed..6126a5a499 100644 --- a/graffiti/storage/elasticsearch/rollindex.go +++ b/graffiti/storage/elasticsearch/rollindex.go @@ -29,7 +29,7 @@ import ( "github.com/pierrec/xxHash/xxHash64" "github.com/skydive-project/skydive/common" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) var ( diff --git a/graffiti/websocket/client.go b/graffiti/websocket/client.go index fb339ced29..0150a60dc6 100644 --- a/graffiti/websocket/client.go +++ b/graffiti/websocket/client.go @@ -32,9 +32,9 @@ import ( "github.com/gorilla/websocket" "github.com/safchain/insanelock" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) const ( diff --git a/graffiti/websocket/message.go b/graffiti/websocket/message.go index 3b5a7976ee..c8bdaeb58f 100644 --- a/graffiti/websocket/message.go +++ b/graffiti/websocket/message.go @@ -30,7 +30,7 @@ import ( uuid "github.com/nu7hatch/gouuid" "github.com/safchain/insanelock" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // Protocol used to transport messages @@ -392,7 +392,7 @@ func (s *StructSpeaker) OnMessage(c Speaker, m Message) { func newStructSpeaker(c Speaker, logger logging.Logger) *StructSpeaker { s := &StructSpeaker{ - Speaker: c, + Speaker: c, structSpeakerEventDispatcher: newStructSpeakerEventDispatcher(), nsSubscribed: make(map[string]bool), replyChan: make(map[string]chan *StructMessage), @@ -498,7 +498,7 @@ func (s *StructServer) OnDisconnected(c Speaker) { // NewStructServer returns a new StructServer func NewStructServer(server *Server) *StructServer { s := &StructServer{ - Server: server, + Server: server, structSpeakerPoolEventDispatcher: newStructSpeakerPoolEventDispatcher(server), } diff --git a/graffiti/websocket/pool.go b/graffiti/websocket/pool.go index e28e3bae4d..4b836000e2 100644 --- a/graffiti/websocket/pool.go +++ b/graffiti/websocket/pool.go @@ -26,8 +26,8 @@ import ( "github.com/safchain/insanelock" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" ) // SpeakerPool is the interface that Speaker pools have to implement. diff --git a/graffiti/websocket/server.go b/graffiti/websocket/server.go index 6d2668d998..fd3bb158ee 100644 --- a/graffiti/websocket/server.go +++ b/graffiti/websocket/server.go @@ -27,10 +27,10 @@ import ( auth "github.com/abbot/go-http-auth" "github.com/gorilla/websocket" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/rbac" "github.com/skydive-project/skydive/graffiti/service" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" ) type clientPromoter func(c *wsIncomingClient) (Speaker, error) diff --git a/gremlin/traversal/flows.go b/gremlin/traversal/flows.go index a32c55fb4e..d2505699a2 100644 --- a/gremlin/traversal/flows.go +++ b/gremlin/traversal/flows.go @@ -33,7 +33,7 @@ import ( "github.com/skydive-project/skydive/graffiti/getter" "github.com/skydive-project/skydive/graffiti/graph" "github.com/skydive-project/skydive/graffiti/graph/traversal" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/topology" "github.com/skydive-project/skydive/topology/probes/socketinfo" ) diff --git a/http/server.go b/http/server.go index 4a4b08ca7d..2041ee5910 100644 --- a/http/server.go +++ b/http/server.go @@ -31,9 +31,9 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/rbac" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" ) // PathPrefix describes the prefix of the path of an URL diff --git a/js/runtime.go b/js/runtime.go index 4c888c8788..3e6d20b36b 100644 --- a/js/runtime.go +++ b/js/runtime.go @@ -29,8 +29,8 @@ import ( "time" "github.com/robertkrimen/otto" + "github.com/skydive-project/skydive/graffiti/logging" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/statics" ) diff --git a/netflow/agent.go b/netflow/agent.go index 1914ea03cf..23f16904ac 100644 --- a/netflow/agent.go +++ b/netflow/agent.go @@ -31,8 +31,8 @@ import ( "github.com/skydive-project/skydive/common" "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/flow" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/portallocator" ) diff --git a/openflow/client.go b/openflow/client.go index b093b7b143..95eedbe86a 100644 --- a/openflow/client.go +++ b/openflow/client.go @@ -32,7 +32,7 @@ import ( "github.com/skydive-project/goloxi" "github.com/skydive-project/goloxi/of13" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) const ( diff --git a/ovs/ovsdb/ovsdb.go b/ovs/ovsdb/ovsdb.go index 4a0a98ccca..97b28cd445 100644 --- a/ovs/ovsdb/ovsdb.go +++ b/ovs/ovsdb/ovsdb.go @@ -28,7 +28,7 @@ import ( "github.com/safchain/insanelock" "github.com/socketplane/libovsdb" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // OvsClient describes an OVS database client connection diff --git a/packetinjector/client.go b/packetinjector/client.go index c3d6df67d0..b21e42b760 100644 --- a/packetinjector/client.go +++ b/packetinjector/client.go @@ -30,10 +30,10 @@ import ( "github.com/skydive-project/skydive/graffiti/api/rest" etcd "github.com/skydive-project/skydive/graffiti/etcd/client" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/ondemand/client" ws "github.com/skydive-project/skydive/graffiti/websocket" ge "github.com/skydive-project/skydive/gremlin/traversal" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/topology" "github.com/skydive-project/skydive/validator" ) diff --git a/packetinjector/forge.go b/packetinjector/forge.go index 64671569ff..ba6eac12a4 100644 --- a/packetinjector/forge.go +++ b/packetinjector/forge.go @@ -28,7 +28,7 @@ import ( "github.com/google/gopacket/layers" "github.com/skydive-project/skydive/api/types" "github.com/skydive-project/skydive/flow" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) var ( diff --git a/packetinjector/pcap.go b/packetinjector/pcap.go index ce6e856f51..fcced618bd 100644 --- a/packetinjector/pcap.go +++ b/packetinjector/pcap.go @@ -23,7 +23,7 @@ import ( "time" "github.com/google/gopacket/pcapgo" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // PcapPacketGenerator reads packets from a pcap file and inject it into a channel @@ -115,6 +115,6 @@ func (p *PcapPacketGenerator) PacketSource() chan *Packet { func NewPcapPacketGenerator(pp *PacketInjectionRequest) (*PcapPacketGenerator, error) { return &PcapPacketGenerator{ PacketInjectionRequest: pp, - close: make(chan bool, 1), + close: make(chan bool, 1), }, nil } diff --git a/packetinjector/server.go b/packetinjector/server.go index 38c3d3597d..53e34b1a66 100644 --- a/packetinjector/server.go +++ b/packetinjector/server.go @@ -29,8 +29,8 @@ import ( "github.com/skydive-project/skydive/graffiti/api/rest" "github.com/skydive-project/skydive/graffiti/getter" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/ondemand" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/rawsocket" "github.com/skydive-project/skydive/topology" ) diff --git a/plugin/topology.go b/plugin/topology.go index 035d97dad1..a713de692e 100644 --- a/plugin/topology.go +++ b/plugin/topology.go @@ -24,7 +24,7 @@ import ( "reflect" "github.com/skydive-project/skydive/config" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/probe" "github.com/skydive-project/skydive/topology/probes" ) diff --git a/sflow/agent.go b/sflow/agent.go index cf0f475b5d..5dea88447a 100644 --- a/sflow/agent.go +++ b/sflow/agent.go @@ -32,8 +32,8 @@ import ( "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/flow" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/portallocator" ) diff --git a/tests/flow_test.go b/tests/flow_test.go index f1ca6b13d8..0c8c3cb620 100644 --- a/tests/flow_test.go +++ b/tests/flow_test.go @@ -38,8 +38,8 @@ import ( "github.com/skydive-project/skydive/api/types" "github.com/skydive-project/skydive/common" "github.com/skydive-project/skydive/flow" + "github.com/skydive-project/skydive/graffiti/logging" g "github.com/skydive-project/skydive/gremlin" - "github.com/skydive-project/skydive/logging" ) // ipv6Supported returns true if the platform support IPv6 diff --git a/tests/tests.go b/tests/tests.go index 53d2c2a2cf..6f6dd86db6 100644 --- a/tests/tests.go +++ b/tests/tests.go @@ -47,10 +47,10 @@ import ( "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/flow" "github.com/skydive-project/skydive/flow/probes" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" g "github.com/skydive-project/skydive/gremlin" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/profiling" ) diff --git a/topology/enhancers/topology_manager.go b/topology/enhancers/topology_manager.go index 6171d1efff..d754601bbc 100644 --- a/topology/enhancers/topology_manager.go +++ b/topology/enhancers/topology_manager.go @@ -28,8 +28,8 @@ import ( "github.com/skydive-project/skydive/graffiti/api/rest" etcd "github.com/skydive-project/skydive/graffiti/etcd/client" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" ge "github.com/skydive-project/skydive/gremlin/traversal" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/topology" ) diff --git a/topology/probes/k8s/cache.go b/topology/probes/k8s/cache.go index e1c8ce43ef..91af8ea048 100644 --- a/topology/probes/k8s/cache.go +++ b/topology/probes/k8s/cache.go @@ -21,7 +21,7 @@ import ( "time" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/topology/probes/k8s/cluster.go b/topology/probes/k8s/cluster.go index 3a53d90d61..ae13ed4f30 100644 --- a/topology/probes/k8s/cluster.go +++ b/topology/probes/k8s/cluster.go @@ -19,7 +19,7 @@ package k8s import ( "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/probe" "github.com/skydive-project/skydive/topology" ) diff --git a/topology/probes/k8s/container.go b/topology/probes/k8s/container.go index a5eb1bd263..1d9d5f1ba1 100644 --- a/topology/probes/k8s/container.go +++ b/topology/probes/k8s/container.go @@ -22,7 +22,7 @@ import ( "github.com/skydive-project/skydive/graffiti/filters" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/probe" "github.com/skydive-project/skydive/topology" diff --git a/topology/probes/k8s/graph.go b/topology/probes/k8s/graph.go index 2fb7a10a3e..7d523667e0 100644 --- a/topology/probes/k8s/graph.go +++ b/topology/probes/k8s/graph.go @@ -20,7 +20,7 @@ package k8s import ( "github.com/skydive-project/skydive/graffiti/filters" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/probe" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/topology/probes/k8s/probe.go b/topology/probes/k8s/probe.go index 47cdef83b8..5b042332e3 100644 --- a/topology/probes/k8s/probe.go +++ b/topology/probes/k8s/probe.go @@ -22,7 +22,7 @@ import ( "time" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/probe" "k8s.io/apimachinery/pkg/util/runtime" diff --git a/topology/probes/netlink/sriov.go b/topology/probes/netlink/sriov.go index 382d3e6eda..aa8feeb884 100644 --- a/topology/probes/netlink/sriov.go +++ b/topology/probes/netlink/sriov.go @@ -32,7 +32,7 @@ import ( "github.com/vishvananda/netlink" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/topology" ) diff --git a/topology/probes/nsm/connection.go b/topology/probes/nsm/connection.go index 39780090eb..74536f2985 100644 --- a/topology/probes/nsm/connection.go +++ b/topology/probes/nsm/connection.go @@ -27,7 +27,7 @@ import ( "github.com/skydive-project/skydive/graffiti/filters" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) type connection interface { diff --git a/topology/probes/nsm/nsm.go b/topology/probes/nsm/nsm.go index 24f6fbc0d7..0b9c1a9fbe 100644 --- a/topology/probes/nsm/nsm.go +++ b/topology/probes/nsm/nsm.go @@ -43,8 +43,8 @@ import ( "k8s.io/client-go/tools/clientcmd" "github.com/skydive-project/skydive/graffiti/graph" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" ) const nsmResource = "networkservicemanagers" diff --git a/topology/probes/ovn/ovn.go b/topology/probes/ovn/ovn.go index 8312e326f0..0f937725b9 100644 --- a/topology/probes/ovn/ovn.go +++ b/topology/probes/ovn/ovn.go @@ -32,7 +32,7 @@ import ( goovn "github.com/ebay/go-ovn" "github.com/skydive-project/skydive/graffiti/getter" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/topology" ) diff --git a/topology/probes/ovsdb/jsonof/ovs_rule_parser.go b/topology/probes/ovsdb/jsonof/ovs_rule_parser.go index 3c5d575f10..76ed3e29d8 100644 --- a/topology/probes/ovsdb/jsonof/ovs_rule_parser.go +++ b/topology/probes/ovsdb/jsonof/ovs_rule_parser.go @@ -38,7 +38,7 @@ import ( "strconv" "strings" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // JSONRule is an openflow rule ready for JSON export diff --git a/topology/probes/ovsdb/ovs_of_test.go b/topology/probes/ovsdb/ovs_of_test.go index a7964f83e8..3572d1f338 100644 --- a/topology/probes/ovsdb/ovs_of_test.go +++ b/topology/probes/ovsdb/ovs_of_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" tp "github.com/skydive-project/skydive/topology/probes" ) diff --git a/topology/probes/peering/peering.go b/topology/probes/peering/peering.go index 1b392d21c6..79fb6d5ee3 100644 --- a/topology/probes/peering/peering.go +++ b/topology/probes/peering/peering.go @@ -19,7 +19,7 @@ package peering import ( "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/topology" ) diff --git a/topology/probes/probe.go b/topology/probes/probe.go index 2faaefa43b..203c9a23e6 100644 --- a/topology/probes/probe.go +++ b/topology/probes/probe.go @@ -25,7 +25,7 @@ package probes import ( "github.com/skydive-project/skydive/config" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/probe" ) diff --git a/topology/probes/runc/runc_test.go b/topology/probes/runc/runc_test.go index 21f6ba4a6c..27bfe3a76c 100644 --- a/topology/probes/runc/runc_test.go +++ b/topology/probes/runc/runc_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" tp "github.com/skydive-project/skydive/topology/probes" ns "github.com/skydive-project/skydive/topology/probes/netns" ) diff --git a/topology/probes/wrapper.go b/topology/probes/wrapper.go index daf5425bdd..44db8c912c 100644 --- a/topology/probes/wrapper.go +++ b/topology/probes/wrapper.go @@ -5,8 +5,8 @@ import ( "sync" "time" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/service" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/probe" ) diff --git a/topology/tid.go b/topology/tid.go index dc773b81f9..15d76405ec 100644 --- a/topology/tid.go +++ b/topology/tid.go @@ -18,10 +18,9 @@ package topology import ( - "github.com/nu7hatch/gouuid" - + uuid "github.com/nu7hatch/gouuid" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" ) // TIDMapper describes the hostID nodes stored in a graph diff --git a/topology/topology.go b/topology/topology.go index b9a5177bc6..cb0337d849 100644 --- a/topology/topology.go +++ b/topology/topology.go @@ -23,7 +23,7 @@ import ( uuid "github.com/nu7hatch/gouuid" "github.com/skydive-project/skydive/graffiti/graph" - "github.com/skydive-project/skydive/logging" + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/netns" ) diff --git a/ui/server.go b/ui/server.go index 0229d0a9ba..4ae0169b06 100644 --- a/ui/server.go +++ b/ui/server.go @@ -28,9 +28,10 @@ import ( "sync" auth "github.com/abbot/go-http-auth" + + "github.com/skydive-project/skydive/graffiti/logging" "github.com/skydive-project/skydive/graffiti/rbac" shttp "github.com/skydive-project/skydive/http" - "github.com/skydive-project/skydive/logging" "github.com/skydive-project/skydive/statics" )