Skip to content

Commit

Permalink
logging: move to graffiti
Browse files Browse the repository at this point in the history
  • Loading branch information
@lebauce
lebauce committed May 26, 2020
1 parent 6032d95 commit 341a219
Show file tree
Hide file tree
Showing 114 changed files with 127 additions and 122 deletions.
2 changes: 1 addition & 1 deletion agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion agent/flow_probes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion agent/host.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion agent/topology_probes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion alert/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion analyzer/probes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion analyzer/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion analyzer/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/server/capture.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/server/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion api/server/pcap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/server/workflow.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/allinone/allinone.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cmd/analyzer/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/alert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/capture.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/client/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/edge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cmd/client/edgerule.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion cmd/client/liner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cmd/client/noderule.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cmd/client/packet_injector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/pcap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/shell.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/workflow.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/seed/seed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/skydive/skydive.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion config/logging.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion config/rbac.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/jsonof/jsonof.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/snort/snortSkydive.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ebpf/tests/tests.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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../
Expand Down
2 changes: 1 addition & 1 deletion flow/application.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flow/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion flow/client/flow_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 341a219

Please sign in to comment.