Skip to content

Commit 30d92d1

Browse files
jasontedorjasontedor
committed
Merge branch 'master' into package-ingest-geoip-as-a-module
* master: (31 commits) Move ingest-geoip default databases out of config (elastic#36949) [ILM][DOCS] add extra scenario to policy update docs (elastic#36871) [Painless] Add String Casting Tests (elastic#36945) SQL: documentation improvements and updates (elastic#36918) [DOCS] Merges list of discovery and cluster formation settings (elastic#36909) Only compress responses if request was compressed (elastic#36867) Remove duplicate paragraph (elastic#36942) Fix URI to cluster stats endpoint on specific nodes (elastic#36784) Fix typo in unitTest task (elastic#36930) RecoveryMonitor#lastSeenAccessTime should be volatile (elastic#36781) [CCR] Add `ccr.auto_follow_coordinator.wait_for_timeout` setting (elastic#36714) Scripting: Remove deprecated params.ctx (elastic#36848) Refactor the REST actions to clarify what endpoints are deprecated. (elastic#36869) Add JDK 12 to CI rotation (elastic#36915) Improve error message for 6.x style realm settings (elastic#36876) Send clear session as routable remote request (elastic#36805) [DOCS] Remove redundant ILM attributes (elastic#36808) SQL: Fix bug regarding histograms usage in scripting (elastic#36866) Update index mappings when ccr restore complete (elastic#36879) Docs: Bump version to alpha2 after release ...
2 parents ce5320e + 6781a29 commit 30d92d1

File tree

259 files changed

+3208
-1373
lines changed

Some content is hidden

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

259 files changed

+3208
-1373
lines changed

‎.ci/matrix-build-javas.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77

88
ES_BUILD_JAVA:
99
- java11
10+
- openjdk12

‎.ci/matrix-runtime-javas.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ ES_RUNTIME_JAVA:
99
- java8
1010
- java8fips
1111
- java11
12+
- openjdk12
1213
- zulu8
1314
- zulu11

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ static Request count(CountRequest countRequest) throws IOException {
479479
}
480480

481481
static Request explain(ExplainRequest explainRequest) throws IOException {
482-
String endpoint = explainRequest.isTypeless()
482+
String endpoint = explainRequest.type().equals(MapperService.SINGLE_MAPPING_NAME)
483483
? endpoint(explainRequest.index(), "_explain", explainRequest.id())
484484
: endpoint(explainRequest.index(), explainRequest.type(), explainRequest.id(), "_explain");
485485
Request request = new Request(HttpGet.METHOD_NAME, endpoint);

‎client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SecurityDocumentationIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,6 @@ public void onFailure(Exception e) {
13181318
}
13191319
}
13201320

1321-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/36362")
13221321
public void testInvalidateToken() throws Exception {
13231322
RestHighLevelClient client = highLevelClient();
13241323

‎distribution/packages/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,6 @@ Closure commonPackageConfig(String type, boolean oss) {
173173
configurationFile '/etc/elasticsearch/users'
174174
configurationFile '/etc/elasticsearch/users_roles'
175175
}
176-
configurationFile '/etc/elasticsearch/ingest-geoip'
177-
configurationFile '/etc/elasticsearch/ingest-geoip/GeoLite2-ASN.mmdb'
178-
configurationFile '/etc/elasticsearch/ingest-geoip/GeoLite2-City.mmdb'
179-
configurationFile '/etc/elasticsearch/ingest-geoip/GeoLite2-Country.mmdb'
180176
into('/etc/elasticsearch') {
181177
dirMode 0750
182178
fileMode 0660

‎docs/Versions.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:version: 7.0.0-alpha1
1+
:version: 7.0.0-alpha2
22
:major-version: 7.x
33
:lucene_version: 8.0.0
44
:lucene_version_path: 8_0_0

‎docs/reference/ccr/apis/auto-follow/delete-auto-follow-pattern.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-delete-auto-follow-pattern]]
4-
=== Delete Auto-Follow Pattern API
4+
=== Delete auto-follow pattern API
55
++++
6-
<titleabbrev>Delete Auto-Follow Pattern</titleabbrev>
6+
<titleabbrev>Delete auto-follow pattern</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/auto-follow/get-auto-follow-pattern.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-get-auto-follow-pattern]]
4-
=== Get Auto-Follow Pattern API
4+
=== Get auto-follow pattern API
55
++++
6-
<titleabbrev>Get Auto-Follow Pattern</titleabbrev>
6+
<titleabbrev>Get auto-follow pattern</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/auto-follow/put-auto-follow-pattern.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-put-auto-follow-pattern]]
4-
=== Create Auto-Follow Pattern API
4+
=== Create auto-follow pattern API
55
++++
6-
<titleabbrev>Create Auto-Follow Pattern</titleabbrev>
6+
<titleabbrev>Create auto-follow pattern</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/follow/get-follow-stats.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-get-follow-stats]]
4-
=== Get Follower Stats API
4+
=== Get follower stats API
55
++++
6-
<titleabbrev>Get Follower Stats</titleabbrev>
6+
<titleabbrev>Get follower stats</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/follow/post-pause-follow.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-post-pause-follow]]
4-
=== Pause Follower API
4+
=== Pause follower API
55
++++
6-
<titleabbrev>Pause Follower</titleabbrev>
6+
<titleabbrev>Pause follower</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/follow/post-resume-follow.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-post-resume-follow]]
4-
=== Resume Follower API
4+
=== Resume follower API
55
++++
6-
<titleabbrev>Resume Follower</titleabbrev>
6+
<titleabbrev>Resume follower</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/follow/put-follow.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-put-follow]]
4-
=== Create Follower API
4+
=== Create follower API
55
++++
6-
<titleabbrev>Create Follower</titleabbrev>
6+
<titleabbrev>Create follower</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/get-ccr-stats.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-get-stats]]
4-
=== Get Cross-Cluster Replication Stats API
4+
=== Get cross-cluster replication stats API
55
++++
6-
<titleabbrev>Get CCR Stats</titleabbrev>
6+
<titleabbrev>Get CCR stats</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/getting-started.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-getting-started]]
4-
== Getting Started with {ccr}
4+
== Getting started with {ccr}
55

66
beta[]
77

‎docs/reference/cluster/stats.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,11 @@ Will return, for example:
218218
// the response are ignored. So we're really only asserting things about the
219219
// the shape of this response, not the values in it.
220220

221-
This API can be restricted to a subset of the nodes using the `?nodeId`
222-
parameter, which accepts <<cluster-nodes,node filters>>:
221+
This API can be restricted to a subset of the nodes using <<cluster-nodes,node
222+
filters>>:
223223

224224
[source,js]
225225
--------------------------------------------------
226-
GET /_cluster/stats?nodeId=node1,node*,master:false
226+
GET /_cluster/stats/nodes/node1,node*,master:false
227227
--------------------------------------------------
228228
// CONSOLE

‎docs/reference/ilm/apis/delete-lifecycle.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="basic"]
33
[[ilm-delete-lifecycle]]
4-
=== Delete Lifecycle Policy API
4+
=== Delete lifecycle policy API
55
++++
6-
<titleabbrev>Delete Policy</titleabbrev>
6+
<titleabbrev>Delete policy</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ilm/apis/explain.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="basic"]
33
[[ilm-explain-lifecycle]]
4-
=== Explain Lifecycle API
4+
=== Explain lifecycle API
55
++++
6-
<titleabbrev>Explain Lifecycle</titleabbrev>
6+
<titleabbrev>Explain lifecycle</titleabbrev>
77
++++
88

99
beta[]
@@ -170,7 +170,7 @@ entered this phase
170170
<3> The date the loaded policy was last modified
171171
<4> The epoch time when the loaded policy was last modified
172172

173-
If {ILM} is waiting for a step to complete, the response includes status
173+
If {ilm-init} is waiting for a step to complete, the response includes status
174174
information for the step that's being performed on the index.
175175

176176
[source,js]

‎docs/reference/ilm/apis/get-lifecycle.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="basic"]
33
[[ilm-get-lifecycle]]
4-
=== Get Lifecycle Policy API
4+
=== Get lifecycle policy API
55
++++
6-
<titleabbrev>Get Policy</titleabbrev>
6+
<titleabbrev>Get policy</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ilm/apis/get-status.asciidoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
[role="xpack"]
22
[testenv="basic"]
33
[[ilm-get-status]]
4-
=== Get {ILM} Status API
4+
=== Get {ilm} status API
55
++++
6-
<titleabbrev>Get {ILM} Status</titleabbrev>
6+
<titleabbrev>Get {ilm} status</titleabbrev>
77
++++
88

99
beta[]
1010

11-
Retrieves the current {ilm} status.
11+
Retrieves the current {ilm} ({ilm-init}) status.
1212

1313
==== Request
1414

1515
`GET /_ilm/status`
1616

1717
==== Description
1818

19-
Returns the status of the {ILM} plugin. The `operation_mode` field in the
19+
Returns the status of the {ilm-init} plugin. The `operation_mode` field in the
2020
response shows one of three states: `STARTED`, `STOPPING`,
21-
or `STOPPED`. You can change the status of the {ILM} plugin with the
21+
or `STOPPED`. You can change the status of the {ilm-init} plugin with the
2222
<<ilm-start, Start ILM>> and <<ilm-stop, Stop ILM>> APIs.
2323

2424
==== Request Parameters
@@ -32,7 +32,7 @@ For more information, see {stack-ov}/security-privileges.html[Security Privilege
3232

3333
==== Examples
3434

35-
The following example gets the {ILM} plugin status.
35+
The following example gets the {ilm-init} plugin status.
3636

3737
[source,js]
3838
--------------------------------------------------

‎docs/reference/ilm/apis/ilm-api.asciidoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
[[index-lifecycle-management-api]]
2-
== Index Lifecycle Management API
2+
== {ilm-cap} API
33

44
beta[]
55

66
You can use the following APIs to manage policies on indices.
77

88
[float]
99
[[ilm-api-policy-endpoint]]
10-
=== Policy Management APIs
10+
=== Policy management APIs
1111

12-
* <<ilm-put-lifecycle,Create Lifecycle Policy>>
13-
* <<ilm-get-lifecycle,Get Lifecycle Policy>>
14-
* <<ilm-delete-lifecycle,Delete Lifecycle Policy>>
12+
* <<ilm-put-lifecycle,Create lifecycle policy>>
13+
* <<ilm-get-lifecycle,Get lifecycle policy>>
14+
* <<ilm-delete-lifecycle,Delete lifecycle policy>>
1515

1616
[float]
1717
[[ilm-api-index-endpoint]]
18-
=== Index Management APIs
18+
=== Index management APIs
1919

20-
* <<ilm-move-to-step,Move Index To Step>>
21-
* <<ilm-retry-policy,Retry Policy On Indices>>
20+
* <<ilm-move-to-step,Move index to step>>
21+
* <<ilm-retry-policy,Retry policy on indices>>
2222

2323
[float]
2424
[[ilm-api-management-endpoint]]
25-
=== Operation Management APIs
25+
=== Operation management APIs
2626

27-
* <<ilm-get-status,Get ILM Operation Mode>>
27+
* <<ilm-get-status,Get ILM operation mode>>
2828
* <<ilm-start,Start ILM>>
2929
* <<ilm-stop,Stop ILM>>
3030
* <<ilm-explain-lifecycle,Explain API>>

‎docs/reference/ilm/apis/move-to-step.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="basic"]
33
[[ilm-move-to-step]]
4-
=== Move to Lifecycle Step API
4+
=== Move to lifecycle step API
55
++++
6-
<titleabbrev>Move to Step</titleabbrev>
6+
<titleabbrev>Move to step</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ilm/apis/put-lifecycle.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="basic"]
33
[[ilm-put-lifecycle]]
4-
=== Create Lifecycle Policy API
4+
=== Create lifecycle policy API
55
++++
6-
<titleabbrev>Create Policy</titleabbrev>
6+
<titleabbrev>Create policy</titleabbrev>
77
++++
88

99
beta[]
@@ -35,7 +35,7 @@ include::{docdir}/rest-api/timeoutparms.asciidoc[]
3535

3636
You must have the `manage_ilm` cluster privilege to use this API. You must
3737
also have the `manage` index privilege on all indices being managed by `policy`.
38-
All operations executed by {Ilm} for a policy are executed as the user that
38+
All operations executed by {ilm} for a policy are executed as the user that
3939
put the latest version of a policy.
4040
For more information, see {stack-ov}/security-privileges.html[Security Privileges].
4141

‎docs/reference/ilm/apis/remove-policy-from-index.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="basic"]
33
[[ilm-remove-policy]]
4-
=== Remove Policy from Index API
4+
=== Remove policy from index API
55
++++
6-
<titleabbrev>Remove Policy</titleabbrev>
6+
<titleabbrev>Remove policy</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ilm/apis/retry-policy.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="basic"]
33
[[ilm-retry-policy]]
4-
=== Retry Policy Execution API
4+
=== Retry policy execution API
55
++++
6-
<titleabbrev>Retry Policy</titleabbrev>
6+
<titleabbrev>Retry policy</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ilm/apis/start.asciidoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
[role="xpack"]
22
[testenv="basic"]
33
[[ilm-start]]
4-
=== Start {ILM} API
4+
=== Start {ilm} API
55
++++
6-
<titleabbrev>Start {ILM}</titleabbrev>
6+
<titleabbrev>Start {ilm}</titleabbrev>
77
++++
88

99
beta[]
1010

11-
Start the {ILM} plugin.
11+
Start the {ilm} ({ilm-init}) plugin.
1212

1313
==== Request
1414

1515
`POST /_ilm/start`
1616

1717
==== Description
1818

19-
Starts the {ILM} plugin if it is currently stopped. {ILM} is started
20-
automatically when the cluster is formed. Restarting {ILM} is only
21-
necessary if it has been stopped using the <<ilm-stop, Stop {ILM} API>>.
19+
Starts the {ilm-init} plugin if it is currently stopped. {ilm-init} is started
20+
automatically when the cluster is formed. Restarting {ilm-init} is only
21+
necessary if it has been stopped using the <<ilm-stop, Stop {ilm-init} API>>.
2222

2323
==== Request Parameters
2424

@@ -27,7 +27,7 @@ include::{docdir}/rest-api/timeoutparms.asciidoc[]
2727
==== Authorization
2828

2929
You must have the `manage_ilm` cluster privilege to use this API.
30-
For more information, see {stack-ov}/security-privileges.html[Security Privileges].
30+
For more information, see {stack-ov}/security-privileges.html[Security privileges].
3131

3232
==== Examples
3333

0 commit comments

Comments
 (0)