Merge branch 'master' into batch-open-indices

elastic · Feb 10, 2022 · e21727b · e21727b
2 parents f584fab + d4f7a98
commit e21727b
Show file tree

Hide file tree

Showing 421 changed files with 3,459 additions and 2,633 deletions.
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ClusterClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ClusterClient.java
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
@@ -276,10 +276,8 @@ public class RestHighLevelClient implements Closeable {
     private volatile ListenableFuture<Optional<String>> versionValidationFuture;
 
     private final IndicesClient indicesClient = new IndicesClient(this);
-    private final ClusterClient clusterClient = new ClusterClient(this);
     private final IngestClient ingestClient = new IngestClient(this);
     private final SnapshotClient snapshotClient = new SnapshotClient(this);
-    private final XPackClient xPackClient = new XPackClient(this);
     private final MachineLearningClient machineLearningClient = new MachineLearningClient(this);
     private final SecurityClient securityClient = new SecurityClient(this);
     private final TransformClient transformClient = new TransformClient(this);
@@ -365,15 +363,6 @@ public final IndicesClient indices() {
         return indicesClient;
     }
 
-    /**
-     * Provides a {@link ClusterClient} which can be used to access the Cluster API.
-     *
-     * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster.html">Cluster API on elastic.co</a>
-     */
-    public final ClusterClient cluster() {
-        return clusterClient;
-    }
-
     /**
      * Provides a {@link IngestClient} which can be used to access the Ingest API.
      *
@@ -392,19 +381,6 @@ public final SnapshotClient snapshot() {
         return snapshotClient;
     }
 
-    /**
-     * Provides methods for accessing the Elastic Licensed X-Pack Info
-     * and Usage APIs that are shipped with the default distribution of
-     * Elasticsearch. All of these APIs will 404 if run against the OSS
-     * distribution of Elasticsearch.
-     * <p>
-     * See the <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/info-api.html">
-     * Info APIs on elastic.co</a> for more information.
-     */
-    public final XPackClient xpack() {
-        return xPackClient;
-    }
-
     /**
      * A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Searchable Snapshots APIs.
      * <p>

diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java
diff --git a/docs/changelog/82685.yaml b/docs/changelog/82685.yaml
@@ -0,0 +1,6 @@
+pr: 82685
+summary: Discard intermediate results upon cancellation for stats endpoints
+area: Stats
+type: bug
+issues:
+ - 82337
diff --git a/docs/changelog/82874.yaml b/docs/changelog/82874.yaml
@@ -0,0 +1,5 @@
+pr: 82874
+summary: 'Add "Has eligible master" Indicator for Health API'
+area: Health
+type: feature
+issues: []
diff --git a/docs/changelog/83591.yaml b/docs/changelog/83591.yaml
@@ -0,0 +1,5 @@
+pr: 83591
+summary: Compress Cursors
+area: SQL
+type: enhancement
+issues: []
diff --git a/docs/reference/migration/migrate_8_0.asciidoc b/docs/reference/migration/migrate_8_0.asciidoc
@@ -9,8 +9,6 @@ your application to {es} 8.0.
 
 See also <<release-highlights>> and <<es-release-notes>>.
 
-coming::[8.0.0]
-
 [discrete]
 [[breaking-changes-8.0]]
 === Breaking changes

diff --git a/docs/reference/ml/trained-models/apis/put-trained-models.asciidoc b/docs/reference/ml/trained-models/apis/put-trained-models.asciidoc
@@ -33,7 +33,6 @@ Requires the `manage_ml` cluster privilege. This privilege is included in the
 The create trained model API enables you to supply a trained model that is not
 created by {dfanalytics}.
 
-
 [[ml-put-trained-models-path-params]]
 == {api-path-parms-title}
 
@@ -893,7 +892,7 @@ Appropriate types are:
 * `tree_ensemble`: The model definition is an ensemble model of decision trees.
 * `lang_ident`: A special type reserved for language identification models.
 * `pytorch`: The stored definition is a PyTorch (specifically a TorchScript) model. Currently only
-NLP models are supported.
+NLP models are supported. For more information, refer to {ml-docs}/ml-nlp.html[{nlp-cap}].
 --
 
 `tags`::

diff --git a/docs/reference/ml/trained-models/apis/stop-trained-model-deployment.asciidoc b/docs/reference/ml/trained-models/apis/stop-trained-model-deployment.asciidoc
@@ -21,10 +21,10 @@ Stops a trained model deployment.
 Requires the `manage_ml` cluster privilege. This privilege is included in the 
 `machine_learning_admin` built-in role.
 
-////
 [[stop-trained-model-deployment-desc]]
 == {api-description-title}
-////
+
+Deployment is required only for trained models that have a PyTorch `model_type`.
 
 [[stop-trained-model-deployment-path-params]]
 == {api-path-parms-title}

diff --git a/docs/reference/release-notes/8.0.0-rc2.asciidoc b/docs/reference/release-notes/8.0.0-rc2.asciidoc
@@ -15,6 +15,27 @@ data loss. If you upgrade from a released version, such as 7.16, to a
 pre-release version for testing, discard the contents of the cluster when you are
 done. Do not attempt to upgrade to the final 8.0 release.
 
+* If you installed {es} from an archive on an aarch64 platform like Linux ARM or macOS M1, the
+`elastic` user password and {kib} enrollment token are not generated
+automatically when starting your node for the first time.
++
+--
+After the node starts, generate the `elastic` password with the
+<<reset-password,`bin/elasticsearch-reset-password`>> tool:
+
+[source,bash]
+----
+bin/elasticsearch-reset-password -u elastic
+----
+
+Then, create an enrollment token for {kib} with the
+<<create-enrollment-token,`bin/elasticsearch-create-enrollment-token`>> tool:
+
+[source,bash]
+----
+bin/elasticsearch-create-enrollment-token -s kibana
+----
+--
 [[deprecation-8.0.0-rc2]]
 [float]
 === Deprecations

diff --git a/docs/reference/release-notes/8.0.0.asciidoc b/docs/reference/release-notes/8.0.0.asciidoc
@@ -1,8 +1,6 @@
 [[release-notes-8.0.0]]
 == {es} version 8.0.0
 
-coming::[8.0.0]
-
 The following list are changes in 8.0.0 as compared to 7.17.0, and combines
 release notes from the 8.0.0-alpha1, -alpha2, -beta1, -rc1 and -rc2 releases.
 

diff --git a/...aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/20_empty_bucket.yml b/...aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/20_empty_bucket.yml
@@ -16,13 +16,13 @@
   - do:
       index:
         index:  empty_bucket_idx
-        id:     1
+        id:     "1"
         body:   { "value": 0, "val1": 3.1 }
 
   - do:
       index:
         index:  empty_bucket_idx
-        id:     2
+        id:     "2"
         body:   { "value": 2, "val1": -3.1 }
 
   - do:

diff --git a/...atrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/30_single_value_field.yml b/...atrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/30_single_value_field.yml
@@ -27,77 +27,77 @@ setup:
   - do:
       index:
         index:  test
-        id:     1
+        id:     "1"
         body:   { "val1": 1.9, "val2": 3.1, "val3": 2.3 }
   - do:
       index:
         index:  test
-        id:     2
+        id:     "2"
         body:   { "val1": -5.2, "val2": -3.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     3
+        id:     "3"
         body:   { "val1": -5.2, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     4
+        id:     "4"
         body:   { "val1": 18.3, "val2": 104.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     5
+        id:     "5"
         body:   { "val1": -53.2, "val2": -322.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     6
+        id:     "6"
         body:   { "val1": -578.9, "val2": 69.9, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     7
+        id:     "7"
         body:   { "val1": 16.2, "val2": 17.2, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     8
+        id:     "8"
         body:   { "val1": -4222.63, "val2": 316.44, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     9
+        id:     "9"
         body:   { "val1": -59999.55, "val2": -3163.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     10
+        id:     "10"
         body:   { "val1": 782.7, "val2": 789.7, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     11
+        id:     "11"
         body:   { "val1": -1.2, "val2": 6.3, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     12
+        id:     "12"
         body:   { "val1": 0, "val2": 1.11, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     13
+        id:     "13"
         body:   { "val1": 0.1, "val2": 0.92, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     14
+        id:     "14"
         body:   { "val1": 0.12, "val2": -82.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        id:     15
+        id:     "15"
         body:   { "val1": 98.2, "val2": 32.4, "val3": 2.3}
 
   - do: