Skip to content

Commit

Permalink
imports changed to ozontech
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitkovskiy Vladimir committed Jan 12, 2022
1 parent f3cf7d2 commit 87d04e6
Show file tree
Hide file tree
Showing 89 changed files with 268 additions and 271 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION ?= 0.1.15
VERSION ?= 0.2.2
UPSTREAM_BRANCH ?= origin/master

.PHONY: prepare
Expand Down
2 changes: 1 addition & 1 deletion cfg/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/bitly/go-simplejson"
"github.com/ghodss/yaml"
"github.com/ozonru/file.d/logger"
"github.com/ozontech/file.d/logger"
)

type Config struct {
Expand Down
70 changes: 35 additions & 35 deletions cmd/file.d.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,44 @@ import (
"syscall"

"github.com/alecthomas/kingpin"
"github.com/ozonru/file.d/cfg"
"github.com/ozonru/file.d/fd"
"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/longpanic"
"github.com/ozonru/file.d/pipeline"
"github.com/ozontech/file.d/cfg"
"github.com/ozontech/file.d/fd"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/longpanic"
"github.com/ozontech/file.d/pipeline"
insaneJSON "github.com/vitkovskii/insane-json"
"go.uber.org/automaxprocs/maxprocs"

_ "github.com/ozonru/file.d/plugin/action/add_host"
_ "github.com/ozonru/file.d/plugin/action/convert_date"
_ "github.com/ozonru/file.d/plugin/action/debug"
_ "github.com/ozonru/file.d/plugin/action/discard"
_ "github.com/ozonru/file.d/plugin/action/flatten"
_ "github.com/ozonru/file.d/plugin/action/join"
_ "github.com/ozonru/file.d/plugin/action/json_decode"
_ "github.com/ozonru/file.d/plugin/action/keep_fields"
_ "github.com/ozonru/file.d/plugin/action/mask"
_ "github.com/ozonru/file.d/plugin/action/modify"
_ "github.com/ozonru/file.d/plugin/action/parse_es"
_ "github.com/ozonru/file.d/plugin/action/parse_re2"
_ "github.com/ozonru/file.d/plugin/action/remove_fields"
_ "github.com/ozonru/file.d/plugin/action/rename"
_ "github.com/ozonru/file.d/plugin/action/throttle"
_ "github.com/ozonru/file.d/plugin/input/dmesg"
_ "github.com/ozonru/file.d/plugin/input/fake"
_ "github.com/ozonru/file.d/plugin/input/file"
_ "github.com/ozonru/file.d/plugin/input/http"
_ "github.com/ozonru/file.d/plugin/input/journalctl"
_ "github.com/ozonru/file.d/plugin/input/k8s"
_ "github.com/ozonru/file.d/plugin/input/kafka"
_ "github.com/ozonru/file.d/plugin/output/devnull"
_ "github.com/ozonru/file.d/plugin/output/elasticsearch"
_ "github.com/ozonru/file.d/plugin/output/file"
_ "github.com/ozonru/file.d/plugin/output/gelf"
_ "github.com/ozonru/file.d/plugin/output/kafka"
_ "github.com/ozonru/file.d/plugin/output/s3"
_ "github.com/ozonru/file.d/plugin/output/splunk"
_ "github.com/ozonru/file.d/plugin/output/stdout"
_ "github.com/ozontech/file.d/plugin/action/add_host"
_ "github.com/ozontech/file.d/plugin/action/convert_date"
_ "github.com/ozontech/file.d/plugin/action/debug"
_ "github.com/ozontech/file.d/plugin/action/discard"
_ "github.com/ozontech/file.d/plugin/action/flatten"
_ "github.com/ozontech/file.d/plugin/action/join"
_ "github.com/ozontech/file.d/plugin/action/json_decode"
_ "github.com/ozontech/file.d/plugin/action/keep_fields"
_ "github.com/ozontech/file.d/plugin/action/mask"
_ "github.com/ozontech/file.d/plugin/action/modify"
_ "github.com/ozontech/file.d/plugin/action/parse_es"
_ "github.com/ozontech/file.d/plugin/action/parse_re2"
_ "github.com/ozontech/file.d/plugin/action/remove_fields"
_ "github.com/ozontech/file.d/plugin/action/rename"
_ "github.com/ozontech/file.d/plugin/action/throttle"
_ "github.com/ozontech/file.d/plugin/input/dmesg"
_ "github.com/ozontech/file.d/plugin/input/fake"
_ "github.com/ozontech/file.d/plugin/input/file"
_ "github.com/ozontech/file.d/plugin/input/http"
_ "github.com/ozontech/file.d/plugin/input/journalctl"
_ "github.com/ozontech/file.d/plugin/input/k8s"
_ "github.com/ozontech/file.d/plugin/input/kafka"
_ "github.com/ozontech/file.d/plugin/output/devnull"
_ "github.com/ozontech/file.d/plugin/output/elasticsearch"
_ "github.com/ozontech/file.d/plugin/output/file"
_ "github.com/ozontech/file.d/plugin/output/gelf"
_ "github.com/ozontech/file.d/plugin/output/kafka"
_ "github.com/ozontech/file.d/plugin/output/s3"
_ "github.com/ozontech/file.d/plugin/output/splunk"
_ "github.com/ozontech/file.d/plugin/output/stdout"
)

var (
Expand Down
24 changes: 12 additions & 12 deletions cmd/file.d_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ import (
"testing"
"time"

"github.com/ozonru/file.d/cfg"
"github.com/ozonru/file.d/fd"
_ "github.com/ozonru/file.d/plugin/action/discard"
_ "github.com/ozonru/file.d/plugin/action/json_decode"
_ "github.com/ozonru/file.d/plugin/action/keep_fields"
_ "github.com/ozonru/file.d/plugin/action/rename"
_ "github.com/ozonru/file.d/plugin/action/throttle"
_ "github.com/ozonru/file.d/plugin/input/fake"
_ "github.com/ozonru/file.d/plugin/input/file"
k8s2 "github.com/ozonru/file.d/plugin/input/k8s"
_ "github.com/ozonru/file.d/plugin/output/devnull"
_ "github.com/ozonru/file.d/plugin/output/kafka"
"github.com/ozontech/file.d/cfg"
"github.com/ozontech/file.d/fd"
_ "github.com/ozontech/file.d/plugin/action/discard"
_ "github.com/ozontech/file.d/plugin/action/json_decode"
_ "github.com/ozontech/file.d/plugin/action/keep_fields"
_ "github.com/ozontech/file.d/plugin/action/rename"
_ "github.com/ozontech/file.d/plugin/action/throttle"
_ "github.com/ozontech/file.d/plugin/input/fake"
_ "github.com/ozontech/file.d/plugin/input/file"
k8s2 "github.com/ozontech/file.d/plugin/input/k8s"
_ "github.com/ozontech/file.d/plugin/output/devnull"
_ "github.com/ozontech/file.d/plugin/output/kafka"
uuid "github.com/satori/go.uuid"
)

Expand Down
8 changes: 4 additions & 4 deletions fd/file.d.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"runtime/debug"

"github.com/bitly/go-simplejson"
"github.com/ozonru/file.d/cfg"
"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/longpanic"
"github.com/ozonru/file.d/pipeline"
"github.com/ozontech/file.d/cfg"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/longpanic"
"github.com/ozontech/file.d/pipeline"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
)
Expand Down
4 changes: 2 additions & 2 deletions fd/plugin_registry.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package fd

import (
"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/pipeline"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/pipeline"
)

var DefaultPluginRegistry = &PluginRegistry{
Expand Down
6 changes: 3 additions & 3 deletions fd/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"time"

"github.com/bitly/go-simplejson"
"github.com/ozonru/file.d/cfg"
"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/pipeline"
"github.com/ozontech/file.d/cfg"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/pipeline"
)

func extractPipelineParams(settings *simplejson.Json) *pipeline.Settings {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ozonru/file.d
module github.com/ozontech/file.d

go 1.17

Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,6 @@ github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLk
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
github.com/rjeczalik/notify v0.9.3-0.20210809113154-3472d85e95cd h1:LHLg0gdpRUCvujg2Zol6e2Uknq5vHycLxqEzYwxt1vY=
github.com/rjeczalik/notify v0.9.3-0.20210809113154-3472d85e95cd/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
Expand Down
2 changes: 1 addition & 1 deletion longpanic/longpanic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package longpanic
import (
"time"

"github.com/ozonru/file.d/logger"
"github.com/ozontech/file.d/logger"
"go.uber.org/atomic"
)

Expand Down
2 changes: 1 addition & 1 deletion pipeline/antispamer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"sync"
"time"

"github.com/ozonru/file.d/logger"
"github.com/ozontech/file.d/logger"
"go.uber.org/atomic"
)

Expand Down
4 changes: 2 additions & 2 deletions pipeline/batch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"sync"
"time"

"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/longpanic"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/longpanic"
)

type Batch struct {
Expand Down
2 changes: 1 addition & 1 deletion pipeline/batch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/ozonru/file.d/logger"
"github.com/ozontech/file.d/logger"
"github.com/stretchr/testify/assert"
"go.uber.org/atomic"
)
Expand Down
2 changes: 1 addition & 1 deletion pipeline/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"time"

"github.com/ozonru/file.d/logger"
"github.com/ozontech/file.d/logger"
insaneJSON "github.com/vitkovskii/insane-json"
"go.uber.org/atomic"
)
Expand Down
7 changes: 4 additions & 3 deletions pipeline/pipeline.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"sync"
"time"

"github.com/ozonru/file.d/decoder"
"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/longpanic"
"github.com/ozontech/file.d/decoder"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/longpanic"
"github.com/prometheus/client_golang/prometheus"
"go.uber.org/atomic"
"go.uber.org/zap"
Expand Down Expand Up @@ -263,6 +263,7 @@ func (p *Pipeline) GetOutput() OutputPlugin {

func (p *Pipeline) In(sourceID SourceID, sourceName string, offset int64, bytes []byte, isNewSource bool) uint64 {
length := len(bytes)
logger.Infof("in %s", bytes)

// don't process shit
isEmpty := length == 0 || (bytes[0] == '\n' && length == 1)
Expand Down
4 changes: 2 additions & 2 deletions pipeline/processor.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package pipeline

import (
"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/longpanic"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/longpanic"
"go.uber.org/atomic"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion pipeline/stream.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"sync"
"time"

"github.com/ozonru/file.d/logger"
"github.com/ozontech/file.d/logger"
)

// stream is a queue of events
Expand Down
4 changes: 2 additions & 2 deletions pipeline/streamer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"sync"
"time"

"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/longpanic"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/longpanic"
)

type streamer struct {
Expand Down
4 changes: 2 additions & 2 deletions plugin/action/add_host/add_host.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package add_host
import (
"os"

"github.com/ozonru/file.d/fd"
"github.com/ozonru/file.d/pipeline"
"github.com/ozontech/file.d/fd"
"github.com/ozontech/file.d/pipeline"
)

/*{ introduction
Expand Down
4 changes: 2 additions & 2 deletions plugin/action/add_host/add_host_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"sync"
"testing"

"github.com/ozonru/file.d/pipeline"
"github.com/ozonru/file.d/test"
"github.com/ozontech/file.d/pipeline"
"github.com/ozontech/file.d/test"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions plugin/action/convert_date/convert_date.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package convert_date
import (
"time"

"github.com/ozonru/file.d/cfg"
"github.com/ozonru/file.d/fd"
"github.com/ozonru/file.d/pipeline"
"github.com/ozontech/file.d/cfg"
"github.com/ozontech/file.d/fd"
"github.com/ozontech/file.d/pipeline"
)

/*{ introduction
Expand Down
8 changes: 4 additions & 4 deletions plugin/action/convert_date/convert_date_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"sync"
"testing"

"github.com/ozonru/file.d/cfg"
"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/pipeline"
"github.com/ozonru/file.d/test"
"github.com/ozontech/file.d/cfg"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/pipeline"
"github.com/ozontech/file.d/test"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions plugin/action/debug/debug.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package debug

import (
"github.com/ozonru/file.d/fd"
"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/pipeline"
"github.com/ozontech/file.d/fd"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/pipeline"
)

/*{ introduction
Expand Down
4 changes: 2 additions & 2 deletions plugin/action/discard/discard.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package discard

import (
"github.com/ozonru/file.d/fd"
"github.com/ozonru/file.d/pipeline"
"github.com/ozontech/file.d/fd"
"github.com/ozontech/file.d/pipeline"
)

/*{ introduction
Expand Down
4 changes: 2 additions & 2 deletions plugin/action/discard/discard_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"sync"
"testing"

"github.com/ozonru/file.d/pipeline"
"github.com/ozonru/file.d/test"
"github.com/ozontech/file.d/pipeline"
"github.com/ozontech/file.d/test"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions plugin/action/flatten/flatten.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package flatten

import (
"github.com/ozonru/file.d/cfg"
"github.com/ozonru/file.d/fd"
"github.com/ozonru/file.d/pipeline"
"github.com/ozontech/file.d/cfg"
"github.com/ozontech/file.d/fd"
"github.com/ozontech/file.d/pipeline"
)

/*{ introduction
Expand Down
8 changes: 4 additions & 4 deletions plugin/action/flatten/flatten_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"sync"
"testing"

"github.com/ozonru/file.d/cfg"
"github.com/ozonru/file.d/logger"
"github.com/ozonru/file.d/pipeline"
"github.com/ozonru/file.d/test"
"github.com/ozontech/file.d/cfg"
"github.com/ozontech/file.d/logger"
"github.com/ozontech/file.d/pipeline"
"github.com/ozontech/file.d/test"
"github.com/stretchr/testify/assert"
)

Expand Down
Loading

0 comments on commit 87d04e6

Please sign in to comment.