Merge branch '6.x' into index-lifecycle-6.x

Author: colings86

buildSrc/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 6.5.0
-lucene            = 7.5.0-snapshot-13b9e28f9d
+lucene            = 7.5.0-snapshot-7f0967ad93
 
 # optional dependencies
 spatial4j         = 0.7

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

@@ -81,7 +81,8 @@ Response:
                     "key": 1425168000000,
                     "doc_count": 2
                 }
-            ]
+            ],
+            "interval": "1M"
         }
     }
 }
@@ -174,7 +175,8 @@ starting at midnight UTC on 1 October 2015:
           "key": 1443664800000,
           "doc_count": 1
         }
-      ]
+      ],
+      "interval": "1h"
     }
   }
 }
@@ -229,7 +231,8 @@ the specified time zone.
           "key": 1443664800000,
           "doc_count": 1
         }
-      ]
+      ],
+      "interval": "1h"
     }
   }
 }

docs/reference/modules/cross-cluster-search.asciidoc

@@ -38,7 +38,7 @@ remote clusters that should be connected to, for instance:
 
 [source,yaml]
 --------------------------------
-search:
+cluster:
     remote:
         cluster_one: <1>
             seeds: 127.0.0.1:9300
@@ -58,7 +58,7 @@ following:
 PUT _cluster/settings
 {
   "persistent": {
-    "search": {
+    "cluster": {
       "remote": {
         "cluster_one": {
           "seeds": [
@@ -94,7 +94,7 @@ because we'll use them later.
 {
     "acknowledged" : true,
     "persistent": {
-        "search": {
+        "cluster": {
           "remote": {
             "cluster_one": {
               "seeds": [
@@ -129,7 +129,7 @@ A remote cluster can be deleted from the cluster settings by setting its seeds t
 PUT _cluster/settings
 {
   "persistent": {
-    "search": {
+    "cluster": {
       "remote": {
         "cluster_three": {
           "seeds": null <1>
@@ -310,7 +310,7 @@ boolean `skip_unavailable` setting, set to `false` by default.
 PUT _cluster/settings
 {
   "persistent": {
-    "search.remote.cluster_two.skip_unavailable": true <1>
+    "cluster.remote.cluster_two.skip_unavailable": true <1>
   }
 }
 --------------------------------
@@ -392,30 +392,30 @@ GET /cluster_one:twitter,cluster_two:twitter,twitter/_search <1>
 [[cross-cluster-search-settings]]
 === Cross cluster search settings
 
-`search.remote.connections_per_cluster`::
+`cluster.remote.connections_per_cluster`::
 
   The number of nodes to connect to per remote cluster. The default is `3`.
 
-`search.remote.initial_connect_timeout`::
+`cluster.remote.initial_connect_timeout`::
 
   The time to wait for remote connections to be established when the node starts. The default is `30s`.
 
-`search.remote.node.attr`::
+`cluster.remote.node.attr`::
 
   A node attribute to filter out nodes that are eligible as a gateway node in
   the remote cluster. For instance a node can have a node attribute
   `node.attr.gateway: true` such that only nodes with this attribute will be
-  connected to if `search.remote.node.attr` is set to `gateway`.
+  connected to if `cluster.remote.node.attr` is set to `gateway`.
 
-`search.remote.connect`::
+`cluster.remote.connect`::
 
   By default, any node in the cluster can act as a cross-cluster client and
-  connect to remote clusters. The `search.remote.connect` setting can be set
+  connect to remote clusters. The `cluster.remote.connect` setting can be set
   to `false` (defaults to `true`) to prevent certain nodes from connecting to
   remote clusters. Cross-cluster search requests must be sent to a node that
   is allowed to act as a cross-cluster client.
 
-`search.remote.${cluster_alias}.skip_unavailable`::
+`cluster.remote.${cluster_alias}.skip_unavailable`::
 
   Per cluster boolean setting that allows to skip specific clusters when no
   nodes belonging to them are available and they are searched as part of a

docs/reference/modules/ml-node.asciidoc

@@ -59,7 +59,7 @@ To create a dedicated ingest node when {xpack} is installed, set:
 node.master: false <1>
 node.data: false <2>
 node.ingest: true <3>
-search.remote.connect: false <4>
+cluster.remote.connect: false <4>
 node.ml: false <5>
 -------------------
 <1> Disable the `node.master` role (enabled by default).
@@ -75,7 +75,7 @@ To create a dedicated coordinating node when {xpack} is installed, set:
 node.master: false <1>
 node.data: false <2>
 node.ingest: false <3>
-search.remote.connect: false <4>
+cluster.remote.connect: false <4>
 node.ml: false <5>
 -------------------
 <1> Disable the `node.master` role (enabled by default).
@@ -105,7 +105,7 @@ To create a dedicated {ml} node, set:
 node.master: false <1>
 node.data: false <2>
 node.ingest: false <3>
-search.remote.connect: false <4>
+cluster.remote.connect: false <4>
 node.ml: true <5>
 xpack.ml.enabled: true <6>
 -------------------

docs/reference/modules/node.asciidoc

@@ -104,7 +104,7 @@ To create a dedicated master-eligible node, set:
 node.master: true <1>
 node.data: false <2>
 node.ingest: false <3>
-search.remote.connect: false <4>
+cluster.remote.connect: false <4>
 -------------------
 <1> The `node.master` role is enabled by default.
 <2> Disable the `node.data` role (enabled by default).
@@ -203,7 +203,7 @@ To create a dedicated data node, set:
 node.master: false <1>
 node.data: true <2>
 node.ingest: false <3>
-search.remote.connect: false <4>
+cluster.remote.connect: false <4>
 -------------------
 <1> Disable the `node.master` role (enabled by default).
 <2> The `node.data` role is enabled by default.
@@ -231,7 +231,7 @@ To create a dedicated ingest node, set:
 node.master: false <1>
 node.data: false <2>
 node.ingest: true <3>
-search.remote.connect: false <4>
+cluster.remote.connect: false <4>
 -------------------
 <1> Disable the `node.master` role (enabled by default).
 <2> Disable the `node.data` role (enabled by default).
@@ -271,7 +271,7 @@ To create a dedicated coordinating node, set:
 node.master: false <1>
 node.data: false <2>
 node.ingest: false <3>
-search.remote.connect: false <4>
+cluster.remote.connect: false <4>
 -------------------
 <1> Disable the `node.master` role (enabled by default).
 <2> Disable the `node.data` role (enabled by default).

modules/lang-expression/licenses/lucene-expressions-7.5.0-snapshot-13b9e28f9d.jar.sha1

@@ -0,0 +1 @@
+3ae82d8192189d536cd4d547de7882e69348b451

modules/lang-expression/licenses/lucene-expressions-7.5.0-snapshot-7f0967ad93.jar.sha1

@@ -0,0 +1 @@
+9feee45491069be5f1aef2ae6153e0488ddc156d

plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0-snapshot-13b9e28f9d.jar.sha1

@@ -0,0 +1 @@
+0233de1d361e7ffb83f103bce4938d167fb52365

plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0-snapshot-7f0967ad93.jar.sha1

@@ -0,0 +1 @@
+212a5e8ae9db3690159b4d0217bee45ec139cd1d

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0-snapshot-13b9e28f9d.jar.sha1

@@ -0,0 +1 @@
+295bccd41649adf85b86bd89d4cfcef014e672a0

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0-snapshot-7f0967ad93.jar.sha1

@@ -0,0 +1 @@
+d98eceaac2e1b90c677b2ce05d5ef2c4146527a8

plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0-snapshot-13b9e28f9d.jar.sha1

@@ -0,0 +1 @@
+3c243dc85f8d79f32c4ee812ea2aa2625c432f0a

plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0-snapshot-7f0967ad93.jar.sha1

@@ -0,0 +1 @@
+32250fea4d17cb722db14d2e9506f42369b0a0b5

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0-snapshot-13b9e28f9d.jar.sha1

@@ -235,8 +235,8 @@ public void testSkipUnavailableDependsOnSeeds() throws IOException {
                         () -> client().performRequest(request));
                 assertEquals(400, responseException.getResponse().getStatusLine().getStatusCode());
                 assertThat(responseException.getMessage(),
-                        containsString("Missing required setting [search.remote.remote1.seeds] " +
-                                "for setting [search.remote.remote1.skip_unavailable]"));
+                        containsString("Missing required setting [cluster.remote.remote1.seeds] " +
+                                "for setting [cluster.remote.remote1.skip_unavailable]"));
             }
 
             Map<String, Object> settingsMap = new HashMap<>();
@@ -251,8 +251,8 @@ public void testSkipUnavailableDependsOnSeeds() throws IOException {
                 ResponseException responseException = expectThrows(ResponseException.class,
                         () -> client().performRequest(request));
                 assertEquals(400, responseException.getResponse().getStatusLine().getStatusCode());
-                assertThat(responseException.getMessage(), containsString("Missing required setting [search.remote.remote1.seeds] " +
-                        "for setting [search.remote.remote1.skip_unavailable]"));
+                assertThat(responseException.getMessage(), containsString("Missing required setting [cluster.remote.remote1.seeds] " +
+                        "for setting [cluster.remote.remote1.skip_unavailable]"));
             }
 
             if (randomBoolean()) {
@@ -304,7 +304,7 @@ private static HttpEntity buildUpdateSettingsRequestBody(Map<String, Object> set
             {
                 builder.startObject("persistent");
                 {
-                    builder.startObject("search.remote.remote1");
+                    builder.startObject("cluster.remote.remote1");
                     {
                         for (Map.Entry<String, Object> entry : settings.entrySet()) {
                             builder.field(entry.getKey(), entry.getValue());

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0-snapshot-7f0967ad93.jar.sha1

@@ -28,7 +28,7 @@ task remoteClusterTest(type: RestIntegTestTask) {
 remoteClusterTestCluster {
   numNodes = 2
   clusterName = 'remote-cluster'
-  setting 'search.remote.connect', false
+  setting 'cluster.remote.connect', false
 }
 
 remoteClusterTestRunner {
@@ -39,9 +39,9 @@ task mixedClusterTest(type: RestIntegTestTask) {}
 
 mixedClusterTestCluster {
   dependsOn remoteClusterTestRunner
-  setting 'search.remote.my_remote_cluster.seeds', "\"${-> remoteClusterTest.nodes.get(0).transportUri()}\""
-  setting 'search.remote.connections_per_cluster', 1
-  setting 'search.remote.connect', true
+  setting 'cluster.remote.my_remote_cluster.seeds', "\"${-> remoteClusterTest.nodes.get(0).transportUri()}\""
+  setting 'cluster.remote.connections_per_cluster', 1
+  setting 'cluster.remote.connect', true
 }
 
 mixedClusterTestRunner {

plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0-snapshot-13b9e28f9d.jar.sha1

@@ -99,16 +99,16 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.search.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
 
   - do:
       cluster.put_settings:
         flat_settings: true
         body:
           transient:
-            search.remote.test_remote_cluster.seeds: $remote_ip
+            cluster.remote.test_remote_cluster.seeds: $remote_ip
 
-  - match: {transient: {search.remote.test_remote_cluster.seeds: $remote_ip}}
+  - match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
 
   - do:
       search:
@@ -124,16 +124,16 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.search.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
 
   - do:
       cluster.put_settings:
         flat_settings: true
         body:
           transient:
-            search.remote.test_remote_cluster.seeds: $remote_ip
+            cluster.remote.test_remote_cluster.seeds: $remote_ip
 
-  - match: {transient: {search.remote.test_remote_cluster.seeds: $remote_ip}}
+  - match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
 
   - do:
       search: