From 2f54a314855203f7679b21f159df93625ec0f1cd Mon Sep 17 00:00:00 2001
From: Tudor Golubenco <tudor@packetbeat.com>
Date: Tue, 24 Nov 2015 14:27:13 +0100
Subject: [PATCH] Update to most recent libbeat version and shared files

---
 Godeps/Godeps.json                            | 60 +++++++++----------
 .../libbeat/outputs/elasticsearch/client.go   |  8 ++-
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 959052fdbfad..b58e16729bdb 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -7,78 +7,78 @@
 	"Deps": [
 		{
 			"ImportPath": "github.com/elastic/libbeat/beat",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/cfgfile",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/common",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/filters",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/logp",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/outputs",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/publisher",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/service",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/cfgfile",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/common",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/filters",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/logp",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/outputs",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/publisher",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/elastic/libbeat/service",
-			"Comment": "v1.0.0-rc2-3-ga35e184",
-			"Rev": "a35e1840d08381622fb4c428f8e1b122c0b42b29"
+			"Comment": "v1.0.0-rc2-16-g7e54c27",
+			"Rev": "7e54c27c23d9c17b343a98edfb8b52cb72a68b1b"
 		},
 		{
 			"ImportPath": "github.com/garyburd/redigo/internal",
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/outputs/elasticsearch/client.go b/Godeps/_workspace/src/github.com/elastic/libbeat/outputs/elasticsearch/client.go
index 0dd9f7d59f58..7cc70a31c7f7 100644
--- a/Godeps/_workspace/src/github.com/elastic/libbeat/outputs/elasticsearch/client.go
+++ b/Godeps/_workspace/src/github.com/elastic/libbeat/outputs/elasticsearch/client.go
@@ -241,14 +241,16 @@ func (conn *Connection) Connect(timeout time.Duration) error {
 }
 
 func (conn *Connection) Ping(timeout time.Duration) (bool, error) {
+	debug("ES Ping(url=%v, timeout=%v)", conn.URL, timeout)
+
 	conn.http.Timeout = timeout
-	resp, err := conn.http.Head(conn.URL)
+	status, _, err := conn.execRequest("HEAD", conn.URL, nil)
 	if err != nil {
+		debug("Ping request failed with: %v", err)
 		return false, err
 	}
-	defer closing(resp.Body)
 
-	status := resp.StatusCode
+	debug("Ping status code: %v", status)
 	return status < 300, nil
 }