Skip to content

Commit 1df639c

Browse files
committed
Merge branch 'master' into batch-open-indices
2 parents f584fab + d4f7a98 commit 1df639c

File tree

422 files changed

+3460
-2634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

422 files changed

+3460
-2634
lines changed

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

Lines changed: 0 additions & 389 deletions
This file was deleted.

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,8 @@ public class RestHighLevelClient implements Closeable {
276276
private volatile ListenableFuture<Optional<String>> versionValidationFuture;
277277

278278
private final IndicesClient indicesClient = new IndicesClient(this);
279-
private final ClusterClient clusterClient = new ClusterClient(this);
280279
private final IngestClient ingestClient = new IngestClient(this);
281280
private final SnapshotClient snapshotClient = new SnapshotClient(this);
282-
private final XPackClient xPackClient = new XPackClient(this);
283281
private final MachineLearningClient machineLearningClient = new MachineLearningClient(this);
284282
private final SecurityClient securityClient = new SecurityClient(this);
285283
private final TransformClient transformClient = new TransformClient(this);
@@ -365,15 +363,6 @@ public final IndicesClient indices() {
365363
return indicesClient;
366364
}
367365

368-
/**
369-
* Provides a {@link ClusterClient} which can be used to access the Cluster API.
370-
*
371-
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster.html">Cluster API on elastic.co</a>
372-
*/
373-
public final ClusterClient cluster() {
374-
return clusterClient;
375-
}
376-
377366
/**
378367
* Provides a {@link IngestClient} which can be used to access the Ingest API.
379368
*
@@ -392,19 +381,6 @@ public final SnapshotClient snapshot() {
392381
return snapshotClient;
393382
}
394383

395-
/**
396-
* Provides methods for accessing the Elastic Licensed X-Pack Info
397-
* and Usage APIs that are shipped with the default distribution of
398-
* Elasticsearch. All of these APIs will 404 if run against the OSS
399-
* distribution of Elasticsearch.
400-
* <p>
401-
* See the <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/info-api.html">
402-
* Info APIs on elastic.co</a> for more information.
403-
*/
404-
public final XPackClient xpack() {
405-
return xPackClient;
406-
}
407-
408384
/**
409385
* A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Searchable Snapshots APIs.
410386
* <p>

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

Lines changed: 0 additions & 115 deletions
This file was deleted.

docs/changelog/82685.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 82685
2+
summary: Discard intermediate results upon cancellation for stats endpoints
3+
area: Stats
4+
type: bug
5+
issues:
6+
- 82337

docs/changelog/82874.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 82874
2+
summary: 'Add "Has eligible master" Indicator for Health API'
3+
area: Health
4+
type: feature
5+
issues: []

docs/changelog/83591.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 83591
2+
summary: Compress Cursors
3+
area: SQL
4+
type: enhancement
5+
issues: []

docs/reference/migration/migrate_8_0.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ your application to {es} 8.0.
99

1010
See also <<release-highlights>> and <<es-release-notes>>.
1111

12-
coming::[8.0.0]
13-
1412
[discrete]
1513
[[breaking-changes-8.0]]
1614
=== Breaking changes

docs/reference/ml/trained-models/apis/put-trained-models.asciidoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ Requires the `manage_ml` cluster privilege. This privilege is included in the
3333
The create trained model API enables you to supply a trained model that is not
3434
created by {dfanalytics}.
3535

36-
3736
[[ml-put-trained-models-path-params]]
3837
== {api-path-parms-title}
3938

@@ -893,7 +892,7 @@ Appropriate types are:
893892
* `tree_ensemble`: The model definition is an ensemble model of decision trees.
894893
* `lang_ident`: A special type reserved for language identification models.
895894
* `pytorch`: The stored definition is a PyTorch (specifically a TorchScript) model. Currently only
896-
NLP models are supported.
895+
NLP models are supported. For more information, refer to {ml-docs}/ml-nlp.html[{nlp-cap}].
897896
--
898897

899898
`tags`::

docs/reference/ml/trained-models/apis/stop-trained-model-deployment.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Stops a trained model deployment.
2121
Requires the `manage_ml` cluster privilege. This privilege is included in the
2222
`machine_learning_admin` built-in role.
2323

24-
////
2524
[[stop-trained-model-deployment-desc]]
2625
== {api-description-title}
27-
////
26+
27+
Deployment is required only for trained models that have a PyTorch `model_type`.
2828

2929
[[stop-trained-model-deployment-path-params]]
3030
== {api-path-parms-title}

docs/reference/release-notes/8.0.0-rc2.asciidoc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,27 @@ data loss. If you upgrade from a released version, such as 7.16, to a
1515
pre-release version for testing, discard the contents of the cluster when you are
1616
done. Do not attempt to upgrade to the final 8.0 release.
1717

18+
* If you installed {es} from an archive on an aarch64 platform like Linux ARM or macOS M1, the
19+
`elastic` user password and {kib} enrollment token are not generated
20+
automatically when starting your node for the first time.
21+
+
22+
--
23+
After the node starts, generate the `elastic` password with the
24+
<<reset-password,`bin/elasticsearch-reset-password`>> tool:
25+
26+
[source,bash]
27+
----
28+
bin/elasticsearch-reset-password -u elastic
29+
----
30+
31+
Then, create an enrollment token for {kib} with the
32+
<<create-enrollment-token,`bin/elasticsearch-create-enrollment-token`>> tool:
33+
34+
[source,bash]
35+
----
36+
bin/elasticsearch-create-enrollment-token -s kibana
37+
----
38+
--
1839
[[deprecation-8.0.0-rc2]]
1940
[float]
2041
=== Deprecations

0 commit comments

Comments
 (0)