From a6f1c7d8794964efd7604e69d00f3e9a8b146ae7 Mon Sep 17 00:00:00 2001
From: Atsushi Kawamura <akawamura@c-fo.com>
Date: Fri, 31 Aug 2018 16:13:36 +0900
Subject: [PATCH 1/2] modify json.New function to support beats 6.4.0

---
 Makefile           | 2 +-
 firehose/client.go | 2 +-
 streams/client.go  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 502c480..2a10c16 100644
--- a/Makefile
+++ b/Makefile
@@ -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"
diff --git a/firehose/client.go b/firehose/client.go
index b05ba53..071c75d 100644
--- a/firehose/client.go
+++ b/firehose/client.go
@@ -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,
 	}
diff --git a/streams/client.go b/streams/client.go
index 44d0e74..59c1159 100644
--- a/streams/client.go
+++ b/streams/client.go
@@ -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,
 	}

From fbf17cc35f87117172c024d0ddbf7aa9f82743df Mon Sep 17 00:00:00 2001
From: Atsushi Kawamura <akawamura@c-fo.com>
Date: Fri, 31 Aug 2018 16:14:19 +0900
Subject: [PATCH 2/2] modify ignored section to skip installing beats into
 vendor/

---
 Gopkg.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gopkg.toml b/Gopkg.toml
index cca672f..0f0c3d1 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -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"