Merge branch '6.4' of github.com:elastic/elasticsearch into 6.4

Author: alpar-t

buildSrc/version.properties

@@ -1,4 +1,4 @@
-elasticsearch     = 6.4.2
+elasticsearch     = 6.4.3
 lucene            = 7.4.0
 
 # optional dependencies

client/rest-high-level/src/main/java/org/elasticsearch/client/IngestClient.java

@@ -29,6 +29,7 @@
 import org.elasticsearch.action.ingest.WritePipelineResponse;
 
 import java.io.IOException;
+import java.util.Collections;
 
 import static java.util.Collections.emptySet;
 
@@ -83,7 +84,7 @@ public void putPipelineAsync(PutPipelineRequest request, RequestOptions options,
      */
     public GetPipelineResponse getPipeline(GetPipelineRequest request, RequestOptions options) throws IOException {
         return restHighLevelClient.performRequestAndParseEntity( request, RequestConverters::getPipeline, options,
-            GetPipelineResponse::fromXContent, emptySet());
+            GetPipelineResponse::fromXContent, Collections.singleton(404));
     }
 
     /**
@@ -96,7 +97,7 @@ public GetPipelineResponse getPipeline(GetPipelineRequest request, RequestOption
      */
     public void getPipelineAsync(GetPipelineRequest request, RequestOptions options, ActionListener<GetPipelineResponse> listener) {
         restHighLevelClient.performRequestAsyncAndParseEntity( request, RequestConverters::getPipeline, options,
-            GetPipelineResponse::fromXContent, listener, emptySet());
+            GetPipelineResponse::fromXContent, listener, Collections.singleton(404));
     }
 
     /**

client/rest-high-level/src/test/java/org/elasticsearch/client/ESRestHighLevelClientTestCase.java

@@ -28,6 +28,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.core.internal.io.IOUtils;
 import org.elasticsearch.ingest.Pipeline;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.junit.AfterClass;
@@ -50,7 +51,7 @@ public void initHighLevelClient() throws IOException {
 
     @AfterClass
     public static void cleanupClient() throws IOException {
-        restHighLevelClient.close();
+        IOUtils.close(restHighLevelClient);
         restHighLevelClient = null;
     }
 

client/rest-high-level/src/test/java/org/elasticsearch/client/IngestClientIT.java

@@ -78,6 +78,16 @@ public void testGetPipeline() throws IOException {
         assertEquals(expectedConfig.getConfigAsMap(), response.pipelines().get(0).getConfigAsMap());
     }
 
+    public void testGetNonexistentPipeline() throws IOException {
+        String id = "nonexistent_pipeline_id";
+
+        GetPipelineRequest request = new GetPipelineRequest(id);
+
+        GetPipelineResponse response =
+            execute(request, highLevelClient().ingest()::getPipeline, highLevelClient().ingest()::getPipelineAsync);
+        assertFalse(response.isFound());
+    }
+
     public void testDeletePipeline() throws IOException {
         String id = "some_pipeline_id";
         {

docs/Versions.asciidoc

@@ -1,4 +1,4 @@
-:version:               6.4.0
+:version:               6.4.2
 :major-version:         6.x
 :lucene_version:        7.4.0
 :lucene_version_path:   7_4_0

docs/build.gradle

@@ -97,6 +97,7 @@ buildRestTests.docs = fileTree(projectDir) {
   exclude 'reference/rollup/apis/delete-job.asciidoc'
   exclude 'reference/rollup/apis/get-job.asciidoc'
   exclude 'reference/rollup/apis/rollup-caps.asciidoc'
+  exclude 'reference/graph/explore.asciidoc'
 }
 
 listSnippets.docs = buildRestTests.docs

docs/plugins/integrations.asciidoc

@@ -56,8 +56,8 @@ releases 2.0 and later do not support rivers.
 * https://github.com/jprante/elasticsearch-jdbc[JDBC importer]:
   The Java Database Connection (JDBC) importer allows to fetch data from JDBC sources for indexing into Elasticsearch (by Jörg Prante)
 
-* https://github.com/reachkrishnaraj/kafka-elasticsearch-standalone-consumer/tree/branch2.0[Kafka Standalone Consumer(Indexer)]:
-  Kafka Standalone Consumer [Indexer] will read messages from Kafka in batches, processes(as implemented) and bulk-indexes them into Elasticsearch. Flexible and scalable. More documentation in above GitHub repo's Wiki.(Please use branch 2.0)!
+* https://github.com/BigDataDevs/kafka-elasticsearch-consumer [Kafka Standalone Consumer(Indexer)]:
+  Kafka Standalone Consumer [Indexer] will read messages from Kafka in batches, processes(as implemented) and bulk-indexes them into Elasticsearch. Flexible and scalable. More documentation in above GitHub repo's Wiki.
 
 * https://github.com/ozlerhakan/mongolastic[Mongolastic]:
   A tool that clones data from Elasticsearch to MongoDB and vice versa

docs/reference/aggregations/bucket/composite-aggregation.asciidoc

@@ -224,7 +224,7 @@ Time values can also be specified via abbreviations supported by <<time-units,ti
 Note that fractional time values are not supported, but you can address this by shifting to another
 time unit (e.g., `1.5h` could instead be specified as `90m`).
 
-====== Format
+*Format*
 
 Internally, a date is represented as a 64 bit number representing a timestamp in milliseconds-since-the-epoch.
 These timestamps are returned as the bucket keys. It is possible to return a formatted date string instead using
@@ -257,7 +257,7 @@ GET /_search
 
 <1> Supports expressive date <<date-format-pattern,format pattern>>
 
-====== Time Zone
+*Time Zone*
 
 Date-times are stored in Elasticsearch in UTC.  By default, all bucketing and
 rounding is also done in UTC. The `time_zone` parameter can be used to indicate

docs/reference/aggregations/bucket/terms-aggregation.asciidoc

@@ -615,7 +615,7 @@ GET /_search
     "aggs" : {
         "genres" : {
             "terms" : {
-                "field" : "gender",
+                "field" : "genre",
                 "script" : {
                     "source" : "'Genre: ' +_value",
                     "lang" : "painless"

docs/reference/analysis/analyzers/custom-analyzer.asciidoc

@@ -59,7 +59,7 @@ PUT my_index
     "analysis": {
       "analyzer": {
         "my_custom_analyzer": {
-          "type":      "custom",
+          "type":      "custom", <1>
           "tokenizer": "standard",
           "char_filter": [
             "html_strip"
@@ -82,6 +82,11 @@ POST my_index/_analyze
 --------------------------------
 // CONSOLE
 
+<1> Setting `type` to `custom` tells Elasticsearch that we are defining a custom analyzer.
+    Compare this to how <<configuring-analyzers,built-in analyzers can be configured>>:
+    `type` will be set to the name of the built-in analyzer, like
+    <<analysis-standard-analyzer,`standard`>> or <<analysis-simple-analyzer,`simple`>>.
+
 /////////////////////
 
 [source,js]