Skip to content

Commit

Permalink
upgrading to beats 7.5.0 (#64)
Browse files Browse the repository at this point in the history
* upgrading to beats 7.5.0
* Upgrading for filebeat 7.5.0
* fix make and go version
* add inputs
  • Loading branch information
ranjithruban authored Feb 15, 2020
1 parent b214ad0 commit adea821
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- "1.11"
- "1.13"

install:
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
Expand Down
2 changes: 1 addition & 1 deletion Makefile
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.5.4"
BEATS_VERSION ?= "7.5.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 example/firehose/filebeat.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
filebeat.prospectors:
filebeat.inputs:
- type: log

# Change to true to enable this prospector configuration.
Expand Down
9 changes: 6 additions & 3 deletions firehose/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@ func newClient(sess *session.Session, config *FirehoseConfig, observer outputs.O
firehose: firehose.New(sess),
deliveryStreamName: config.DeliveryStreamName,
beatName: beat.Beat,
encoder: json.New(false, true, beat.Version),
timeout: config.Timeout,
observer: observer,
encoder: json.New(beat.Version, json.Config{
Pretty: false,
EscapeHTML: false,
}),
timeout: config.Timeout,
observer: observer,
}

return client, nil
Expand Down
1 change: 1 addition & 0 deletions firehose/firehose.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var (
)

func New(
_ outputs.IndexManager,
beat beat.Info,
stats outputs.Observer,
cfg *common.Config,
Expand Down
9 changes: 6 additions & 3 deletions streams/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@ func newClient(sess *session.Session, config *StreamsConfig, observer outputs.Ob
streamName: config.DeliveryStreamName,
partitionKeyProvider: partitionKeyProvider,
beatName: beat.Beat,
encoder: json.New(false, true, beat.Version),
timeout: config.Timeout,
observer: observer,
encoder: json.New(beat.Version, json.Config{
Pretty: false,
EscapeHTML: false,
}),
timeout: config.Timeout,
observer: observer,
}

return client, nil
Expand Down
1 change: 1 addition & 0 deletions streams/streams.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var (
)

func New(
_ outputs.IndexManager,
beat beat.Info,
stats outputs.Observer,
cfg *common.Config,
Expand Down

0 comments on commit adea821

Please sign in to comment.