Upgrading server dependency. (#8807)

6 files changed, 14 insertions, 15 deletions

diff --git a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml
index 82b36e7d0..9251fb7cd 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml
+++ b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml
@@ -12,5 +12,5 @@ services:
   - docker
 before_install:
   - sudo sysctl -w vm.max_map_count=262144
-  - docker run --rm --privileged=true -p 9200:9200 -p 9300:9300 -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:5.6.8 elasticsearch -Expack.security.enabled=false -Escript.inline=true -Escript.stored=true -Escript.file=true -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_ >& /dev/null &
+  - docker run --rm --privileged=true -p 9200:9200 -p 9300:9300 -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:5.6.9 elasticsearch -Expack.security.enabled=false -Escript.inline=true -Escript.stored=true -Escript.file=true -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_ >& /dev/null &
   - sleep 30
diff --git a/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS b/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS
index 73a471f39..7d7c3832f 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS
+++ b/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS
@@ -29,6 +29,7 @@ Braden Bassingthwaite [@bbassingthwaite-va](https://github.com/bbassingthwaite-v
 Brady Love [@bradylove](https://github.com/bradylove)
 Bryan Conklin [@bmconklin](https://github.com/bmconklin)
 Bruce Zhou [@brucez-isell](https://github.com/brucez-isell)
+César Jiménez [@cesarjimenez](https://github.com/cesarjimenez)
 cforbes [@cforbes](https://github.com/cforbes)
 Chris M [@tebriel](https://github.com/tebriel)
 Chris Rice [@donutmonger](https://github.com/donutmonger)
@@ -61,9 +62,11 @@ Henry Clifford [@hcliff](https://github.com/hcliff)
 Igor Dubinskiy [@idubinskiy](https://github.com/idubinskiy)
 initialcontext [@initialcontext](https://github.com/initialcontext)
 Isaac Saldana [@isaldana](https://github.com/isaldana)
+J Barkey Wolf [@jjhbw](https://github.com/jjhbw)
 Jack Lindamood [@cep21](https://github.com/cep21)
 Jacob [@jdelgad](https://github.com/jdelgad)
 Jayme Rotsaert [@jrots](https://github.com/jrots)
+Jeff Rand [@jeffrand](https://github.com/jeffrand)
 Jeremy Canady [@jrmycanady](https://github.com/jrmycanady)
 Jim Berlage [@jimberlage](https://github.com/jimberlage)
 Joe Buck [@four2five](https://github.com/four2five)
@@ -71,6 +74,7 @@ John Barker [@j16r](https://github.com/j16r)
 John Goodall [@jgoodall](https://github.com/jgoodall)
 John Stanford [@jxstanford](https://github.com/jxstanford)
 Jonas Groenaas Drange [@semafor](https://github.com/semafor)
+Josef Fröhle [@Dexus](https://github.com/Dexus)
 Josh Chorlton [@jchorl](https://github.com/jchorl)
 jun [@coseyo](https://github.com/coseyo)
 Junpei Tsuji [@jun06t](https://github.com/jun06t)
@@ -88,6 +92,8 @@ Marcy Buccellato [@marcybuccellato](https://github.com/marcybuccellato)
 Mark Costello [@mcos](https://github.com/mcos)
 Martin Häger [@protomouse](https://github.com/protomouse)
 Medhi Bechina [@mdzor](https://github.com/mdzor)
+Mike Beshai [@mbesh](https://github.com/mbesh)
+mmfrb [@mmfrb](https://github.com/mmfrb)
 mnpritula [@mnpritula](https://github.com/mnpritula)
 mosa [@mosasiru](https://github.com/mosasiru)
 naimulhaider [@naimulhaider](https://github.com/naimulhaider)
@@ -109,6 +115,7 @@ Sacheendra talluri [@sacheendra](https://github.com/sacheendra)
 Sean DuBois [@Sean-Der](https://github.com/Sean-Der)
 Shalin LK [@shalinlk](https://github.com/shalinlk)
 singham [@zhaochenxiao90](https://github.com/zhaochenxiao90)
+Slawomir CALUCH [@slawo](https://github.com/slawo)
 Stephen Kubovic [@stephenkubovic](https://github.com/stephenkubovic)
 Stuart Warren [@Woz](https://github.com/stuart-warren)
 Sulaiman [@salajlan](https://github.com/salajlan)
diff --git a/vendor/gopkg.in/olivere/elastic.v5/client.go b/vendor/gopkg.in/olivere/elastic.v5/client.go
index e709b0bf4..95debc4d9 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/client.go
+++ b/vendor/gopkg.in/olivere/elastic.v5/client.go
@@ -26,7 +26,7 @@ import (
 
 const (
 	// Version is the current version of Elastic.
-	Version = "5.0.66"
+	Version = "5.0.68"
 
 	// DefaultURL is the default endpoint of Elasticsearch on the local machine.
 	// It is used e.g. when initializing a new Client without a specific URL.
diff --git a/vendor/gopkg.in/olivere/elastic.v5/nodes_info.go b/vendor/gopkg.in/olivere/elastic.v5/nodes_info.go
index b3687d689..d03fdf9c3 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/nodes_info.go
+++ b/vendor/gopkg.in/olivere/elastic.v5/nodes_info.go
@@ -150,6 +150,9 @@ type NodesInfoNode struct {
 	// HTTPSAddress, e.g. "127.0.0.1:9200"
 	HTTPSAddress string `json:"https_address"`
 
+	// Roles of the node, e.g. [master, ingest, data]
+	Roles []string `json:"roles"`
+
 	// Attributes of the node.
 	Attributes map[string]interface{} `json:"attributes"`
 
diff --git a/vendor/gopkg.in/olivere/elastic.v5/run-es.sh b/vendor/gopkg.in/olivere/elastic.v5/run-es.sh
index b22e87675..26814f0d0 100755
--- a/vendor/gopkg.in/olivere/elastic.v5/run-es.sh
+++ b/vendor/gopkg.in/olivere/elastic.v5/run-es.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-VERSION=${VERSION:=5.6.8}
+VERSION=${VERSION:=5.6.9}
 docker run --rm --privileged=true -p 9200:9200 -p 9300:9300 -v "$PWD/etc:/usr/share/elasticsearch/config" -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:$VERSION elasticsearch -Expack.security.enabled=false -Expack.ml.enabled=false -Escript.inline=true -Escript.stored=true -Escript.file=true
diff --git a/vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go b/vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go
index ec34302f8..82821b0b6 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go
+++ b/vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go
@@ -114,18 +114,7 @@ func (q *FunctionScoreQuery) Source() (interface{}, error) {
 		query["filter"] = src
 	}
 
-	if len(q.filters) == 1 && q.filters[0] == nil {
-		// Weight needs to be serialized on this level.
-		if weight := q.scoreFuncs[0].GetWeight(); weight != nil {
-			query["weight"] = weight
-		}
-		// Serialize the score function
-		src, err := q.scoreFuncs[0].Source()
-		if err != nil {
-			return nil, err
-		}
-		query[q.scoreFuncs[0].Name()] = src
-	} else {
+	if len(q.filters) > 0 {
 		funcs := make([]interface{}, len(q.filters))
 		for i, filter := range q.filters {
 			hsh := make(map[string]interface{})