Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move filebeat/reader to libbeat/reader #8206

Merged
merged 3 commits into from
Sep 4, 2018
Merged

Move filebeat/reader to libbeat/reader #8206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f22cd5
move filebeat/readers to libbeat/readers
kvch Sep 3, 2018
08cb259
more imports
kvch Sep 3, 2018
6cdbfd8
add entry to dev changelog
kvch Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG-developer.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ The list below covers the major changes between 6.3.0 and master only.
`mage -h goTestUnit`. {pull}7766[7766]
- Beats packaging now build non-oss binaries from code located in the x-pack folder. {issue}7783[7783]
- New function `AddTagsWithKey` is added, so `common.MapStr` can be enriched with tags with an arbitrary key. {pull}7991[7991]
- Move filebeat/reader to libbeat/reader {pull}8206[8206]
4 changes: 2 additions & 2 deletions filebeat/input/log/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
cfg "github.com/elastic/beats/filebeat/config"
"github.com/elastic/beats/filebeat/harvester"
"github.com/elastic/beats/filebeat/input/file"
"github.com/elastic/beats/filebeat/reader/multiline"
"github.com/elastic/beats/filebeat/reader/readjson"
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/libbeat/common/match"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/libbeat/reader/multiline"
"github.com/elastic/beats/libbeat/reader/readjson"
)

var (
Expand Down
10 changes: 5 additions & 5 deletions filebeat/input/log/harvester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ import (
"github.com/elastic/beats/filebeat/channel"
"github.com/elastic/beats/filebeat/harvester"
"github.com/elastic/beats/filebeat/input/file"
"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/filebeat/reader/multiline"
"github.com/elastic/beats/filebeat/reader/readfile"
"github.com/elastic/beats/filebeat/reader/readfile/encoding"
"github.com/elastic/beats/filebeat/reader/readjson"
"github.com/elastic/beats/filebeat/util"
"github.com/elastic/beats/libbeat/reader"
"github.com/elastic/beats/libbeat/reader/multiline"
"github.com/elastic/beats/libbeat/reader/readfile"
"github.com/elastic/beats/libbeat/reader/readfile/encoding"
"github.com/elastic/beats/libbeat/reader/readjson"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions filebeat/input/log/harvester_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (

"github.com/stretchr/testify/assert"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/filebeat/reader/readfile/encoding"
"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/reader"
"github.com/elastic/beats/libbeat/reader/readfile/encoding"
)

func TestReadLine(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions filebeat/scripts/tester/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import (
"strings"
"time"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/filebeat/reader/multiline"
"github.com/elastic/beats/filebeat/reader/readfile"
"github.com/elastic/beats/filebeat/reader/readfile/encoding"
"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/match"
"github.com/elastic/beats/libbeat/reader"
"github.com/elastic/beats/libbeat/reader/multiline"
"github.com/elastic/beats/libbeat/reader/readfile"
"github.com/elastic/beats/libbeat/reader/readfile/encoding"
)

type logReaderConfig struct {
Expand Down
0 filebeat/reader/doc.go → libbeat/reader/doc.go
View file
Open in desktop
File renamed without changes.
0 filebeat/reader/message.go → libbeat/reader/message.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions filebeat/reader/multiline/multiline.go → libbeat/reader/multiline/multiline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"fmt"
"time"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/filebeat/reader/readfile"
"github.com/elastic/beats/libbeat/common/match"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/libbeat/reader"
"github.com/elastic/beats/libbeat/reader/readfile"
)

// MultiLine reader combining multiple line events into one multi-line event.
Expand Down
0 ...beat/reader/multiline/multiline_config.go → libbeat/reader/multiline/multiline_config.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions filebeat/reader/multiline/multiline_test.go → libbeat/reader/multiline/multiline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ import (

"github.com/stretchr/testify/assert"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/filebeat/reader/readfile"
"github.com/elastic/beats/filebeat/reader/readfile/encoding"
"github.com/elastic/beats/libbeat/common/match"
"github.com/elastic/beats/libbeat/reader"
"github.com/elastic/beats/libbeat/reader/readfile"
"github.com/elastic/beats/libbeat/reader/readfile/encoding"
)

type bufferSource struct{ buf *bytes.Buffer }
Expand Down
0 filebeat/reader/reader.go → libbeat/reader/reader.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions filebeat/reader/readfile/encode.go → libbeat/reader/readfile/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"io"
"time"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/filebeat/reader/readfile/encoding"
"github.com/elastic/beats/libbeat/reader"
"github.com/elastic/beats/libbeat/reader/readfile/encoding"
)

// Reader produces lines by reading lines from an io.Reader
Expand Down
0 ...beat/reader/readfile/encoding/encoding.go → libbeat/reader/readfile/encoding/encoding.go
View file
Open in desktop
File renamed without changes.
0 filebeat/reader/readfile/encoding/mixed.go → libbeat/reader/readfile/encoding/mixed.go
View file
Open in desktop
File renamed without changes.
0 filebeat/reader/readfile/encoding/utf16.go → libbeat/reader/readfile/encoding/utf16.go
View file
Open in desktop
File renamed without changes.
0 ...at/reader/readfile/encoding/utf16_test.go → ...at/reader/readfile/encoding/utf16_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion filebeat/reader/readfile/limit.go → libbeat/reader/readfile/limit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package readfile

import (
"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/libbeat/reader"
)

// Reader sets an upper limited on line length. Lines longer
Expand Down
2 changes: 1 addition & 1 deletion filebeat/reader/readfile/limit_test.go → libbeat/reader/readfile/limit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/libbeat/reader"
)

type mockReader struct {
Expand Down
0 filebeat/reader/readfile/line.go → libbeat/reader/readfile/line.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion filebeat/reader/readfile/line_test.go → libbeat/reader/readfile/line_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/assert"
"golang.org/x/text/transform"

"github.com/elastic/beats/filebeat/reader/readfile/encoding"
"github.com/elastic/beats/libbeat/reader/readfile/encoding"
)

// Sample texts are from http://www.columbia.edu/~kermit/utf8.html
Expand Down
2 changes: 1 addition & 1 deletion filebeat/reader/readfile/strip_newline.go → libbeat/reader/readfile/strip_newline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package readfile

import (
"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/libbeat/reader"
)

// StripNewline reader removes the last trailing newline characters from
Expand Down
0 ...eat/reader/readfile/strip_newline_test.go → ...eat/reader/readfile/strip_newline_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion filebeat/reader/readfile/timeout.go → libbeat/reader/readfile/timeout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"time"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/libbeat/reader"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion filebeat/reader/readjson/docker_json.go → libbeat/reader/readjson/docker_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"strings"
"time"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/reader"

"github.com/pkg/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion filebeat/reader/readjson/docker_json_test.go → libbeat/reader/readjson/docker_json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"testing"
"time"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/reader"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion filebeat/reader/readjson/json.go → libbeat/reader/readjson/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"fmt"
"time"

"github.com/elastic/beats/filebeat/reader"
"github.com/elastic/beats/libbeat/beat"
"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/jsontransform"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/libbeat/reader"
)

// JSONReader parses JSON inputs
Expand Down
0 filebeat/reader/readjson/json_config.go → libbeat/reader/readjson/json_config.go
View file
Open in desktop
File renamed without changes.
0 filebeat/reader/readjson/json_test.go → libbeat/reader/readjson/json_test.go
View file
Open in desktop
File renamed without changes.