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

Beats version 6.4.0 support #47

Merged
merged 2 commits into from
Aug 31, 2018
Merged

Beats version 6.4.0 support #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6f1c7d
modify json.New function to support beats 6.4.0
at-k Aug 31, 2018
fbf17cc
modify ignored section to skip installing beats into vendor/
at-k Aug 31, 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
2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# go-tests = true
# unused-packages = true

ignored = ["github.com/elastic/beats"]
ignored = ["github.com/elastic/beats*"]

[[constraint]]
name = "github.com/aws/aws-sdk-go"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MAKE_VARIABLES := $(.VARIABLES)

GO_VERSION=$(shell go version | cut -d ' ' -f 3 | sed -e 's/ /-/g' | sed -e 's/\//-/g' | sed -e 's/^go//g')
GO_PLATFORM ?= $(shell go version | cut -d ' ' -f 4 | sed -e 's/ /-/g' | sed -e 's/\//-/g')
BEATS_VERSION ?= "6.3.0"
BEATS_VERSION ?= "6.4.0"
BEATS_TAG ?= $(shell echo ${BEATS_VERSION} | sed 's/[^[:digit:]]*\([[:digit:]]*\(\.[[:digit:]]*\)\)/v\1/')
AWSBEATS_VERSION ?= $(shell script/version)
BEAT_NAME ?= "filebeat"
Expand Down
2 changes: 1 addition & 1 deletion firehose/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func newClient(sess *session.Session, config *FirehoseConfig, observer outputs.O
firehose: firehose.New(sess),
deliveryStreamName: config.DeliveryStreamName,
beatName: beat.Beat,
encoder: json.New(false, beat.Version),
encoder: json.New(false, true, beat.Version),
timeout: config.Timeout,
observer: observer,
}
Expand Down
2 changes: 1 addition & 1 deletion streams/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func newClient(sess *session.Session, config *StreamsConfig, observer outputs.Ob
streamName: config.DeliveryStreamName,
partitionKeyProvider: partitionKeyProvider,
beatName: beat.Beat,
encoder: json.New(false, beat.Version),
encoder: json.New(false, true, beat.Version),
timeout: config.Timeout,
observer: observer,
}
Expand Down