From 5ecb7ddc8c7dc1cdd6822c21b7a3d48804583ff3 Mon Sep 17 00:00:00 2001 From: Nick Revin Date: Tue, 1 May 2018 01:07:02 +0300 Subject: [PATCH] bumped beats version to 5.6.9 --- Gopkg.lock | 6 +++--- Gopkg.toml | 2 +- vendor/github.com/elastic/beats/libbeat/beat/version.go | 2 +- .../elastic/beats/libbeat/outputs/elasticsearch/output.go | 7 ++++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 9c5cc839..22a483d3 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -88,8 +88,8 @@ "metricbeat/schema", "metricbeat/schema/mapstriface" ] - revision = "709b21ca5c9ef53f1217cb94522d8e720d1e4027" - version = "v5.6.8" + revision = "12bcd55d7f8f678bb1e513679e2da71810f91d63" + version = "v5.6.9" [[projects]] name = "github.com/elastic/go-lumber" @@ -212,6 +212,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "cea8a660d231beb6022d1898334192335c8d8dc34aa96142ed5623286ea1ec41" + inputs-digest = "108f57574325e2e5212847c83d53911127618b61127f4a34bea37523556dce06" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 31e479c5..7578f2a4 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -35,7 +35,7 @@ [[constraint]] name = "github.com/elastic/beats" - version = "5.6.8" + version = "5.6.9" [prune] go-tests = true diff --git a/vendor/github.com/elastic/beats/libbeat/beat/version.go b/vendor/github.com/elastic/beats/libbeat/beat/version.go index adf016e9..2f110c3a 100644 --- a/vendor/github.com/elastic/beats/libbeat/beat/version.go +++ b/vendor/github.com/elastic/beats/libbeat/beat/version.go @@ -1,3 +1,3 @@ package beat -const defaultBeatVersion = "5.6.8" +const defaultBeatVersion = "5.6.9" diff --git a/vendor/github.com/elastic/beats/libbeat/outputs/elasticsearch/output.go b/vendor/github.com/elastic/beats/libbeat/outputs/elasticsearch/output.go index 6b312b0b..cde0b99e 100644 --- a/vendor/github.com/elastic/beats/libbeat/outputs/elasticsearch/output.go +++ b/vendor/github.com/elastic/beats/libbeat/outputs/elasticsearch/output.go @@ -10,6 +10,8 @@ import ( "sync" "time" + "github.com/joeshaw/multierror" + "github.com/elastic/beats/libbeat/common" "github.com/elastic/beats/libbeat/common/op" "github.com/elastic/beats/libbeat/logp" @@ -82,15 +84,18 @@ func NewConnectedClient(cfg *common.Config) (*Client, error) { return nil, err } + var errs multierror.Errors + for _, client := range clients { err = client.Connect(client.timeout) if err != nil { logp.Err("Error connecting to Elasticsearch: %s", client.Connection.URL) + errs = append(errs, err) continue } return &client, nil } - return nil, fmt.Errorf("Couldn't connect to any of the configured Elasticsearch hosts") + return nil, fmt.Errorf("Couldn't connect to any of the configured Elasticsearch hosts, errors: %v", errs.Err()) } // NewElasticsearchClients returns a list of Elasticsearch clients based on the given