From adea82178aecf875a8d431fec55404e19ffd5be3 Mon Sep 17 00:00:00 2001
From: ranjithruban <ranjithruban@gmail.com>
Date: Sat, 15 Feb 2020 14:05:19 +0100
Subject: [PATCH] upgrading to beats 7.5.0 (#64)

* upgrading to beats 7.5.0
* Upgrading for filebeat 7.5.0
* fix make and go version
* add inputs
---
 .travis.yml                   | 2 +-
 Makefile                      | 2 +-
 example/firehose/filebeat.yml | 2 +-
 firehose/client.go            | 9 ++++++---
 firehose/firehose.go          | 1 +
 streams/client.go             | 9 ++++++---
 streams/streams.go            | 1 +
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3b0b741..dd4092d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - "1.11"
+  - "1.13"
 
 install:
   - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
diff --git a/Makefile b/Makefile
index 7cba570..41eab9d 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.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
diff --git a/example/firehose/filebeat.yml b/example/firehose/filebeat.yml
index ab58048..c7352ed 100644
--- a/example/firehose/filebeat.yml
+++ b/example/firehose/filebeat.yml
@@ -1,4 +1,4 @@
-filebeat.prospectors:
+filebeat.inputs:
 - type: log
 
   # Change to true to enable this prospector configuration.
diff --git a/firehose/client.go b/firehose/client.go
index fce494e..185228e 100644
--- a/firehose/client.go
+++ b/firehose/client.go
@@ -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
diff --git a/firehose/firehose.go b/firehose/firehose.go
index 36e3fd4..2df54b9 100644
--- a/firehose/firehose.go
+++ b/firehose/firehose.go
@@ -14,6 +14,7 @@ var (
 )
 
 func New(
+	_ outputs.IndexManager,
 	beat beat.Info,
 	stats outputs.Observer,
 	cfg *common.Config,
diff --git a/streams/client.go b/streams/client.go
index bb1a283..2e8f5a2 100644
--- a/streams/client.go
+++ b/streams/client.go
@@ -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
diff --git a/streams/streams.go b/streams/streams.go
index 43bcfc3..c832926 100644
--- a/streams/streams.go
+++ b/streams/streams.go
@@ -14,6 +14,7 @@ var (
 )
 
 func New(
+	_ outputs.IndexManager,
 	beat beat.Info,
 	stats outputs.Observer,
 	cfg *common.Config,