Skip to content

Commit f3dae85

Browse files
committed
Merge branch '6.x' into ccr-6.x
* 6.x: Only enforce password hashing check if FIPS enabled (#32383) Introduce fips_mode setting and associated checks (#32326) [DOCS] Fix formatting error in Slack action Ingest: Support integer and long hex values in convert (#32213) Release pipelined request in netty server tests (#32368) Add opaque_id to index audit logging (#32260) Painless: Fix documentation links to use existing refs (#32335) Painless: Decouple PainlessLookupBuilder and Whitelists (#32346) [DOCS] Adds recommendation for xpack.security.enabled (#32345) [test] package pre-install java check (#32259) [DOCS] Adds link from bucket_span property to common time units [DOCS] Fixes typo in ML aggregations page [ML][DOCS] Add documentation for detector rules and filters (#32013) Bump the 6.x branch to 6.5.0 (#32361) fixes broken build repository-s3 for third-party-tests
2 parents fb51538 + 06e462e commit f3dae85

File tree

73 files changed

+1428
-267
lines changed

Some content is hidden

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

73 files changed

+1428
-267
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
elasticsearch = 6.4.0
1+
elasticsearch = 6.5.0
22
lucene = 7.5.0-snapshot-b9e064b935
33

44
# optional dependencies

docs/Versions.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:version: 6.4.0
1+
:version: 6.5.0
22
:major-version: 6.x
33
:lucene_version: 7.5.0
44
:lucene_version_path: 7_5_0
Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[[painless-contexts]]
22
== Painless contexts
33

4-
:es_version: https://www.elastic.co/guide/en/elasticsearch/reference/master
5-
:xp_version: https://www.elastic.co/guide/en/x-pack/current
6-
74
A Painless script is evaluated within a context. Each context has values that
85
are available as local variables, a whitelist that controls the available
96
classes, and the methods and fields within those classes (API), and
@@ -18,41 +15,41 @@ specialized code may define new ways to use a Painless script.
1815
| Name | Painless Documentation
1916
| Elasticsearch Documentation
2017
| Update | <<painless-update-context, Painless Documentation>>
21-
| {es_version}/docs-update.html[Elasticsearch Documentation]
18+
| {ref}/docs-update.html[Elasticsearch Documentation]
2219
| Update by query | <<painless-update-by-query-context, Painless Documentation>>
23-
| {es_version}/docs-update-by-query.html[Elasticsearch Documentation]
20+
| {ref}/docs-update-by-query.html[Elasticsearch Documentation]
2421
| Reindex | <<painless-reindex-context, Painless Documentation>>
25-
| {es_version}/docs-reindex.html[Elasticsearch Documentation]
22+
| {ref}/docs-reindex.html[Elasticsearch Documentation]
2623
| Sort | <<painless-sort-context, Painless Documentation>>
27-
| {es_version}/search-request-sort.html[Elasticsearch Documentation]
24+
| {ref}/search-request-sort.html[Elasticsearch Documentation]
2825
| Similarity | <<painless-similarity-context, Painless Documentation>>
29-
| {es_version}/index-modules-similarity.html[Elasticsearch Documentation]
30-
| Weight | <<painless-similarity-context, Painless Documentation>>
31-
| {es_version}/index-modules-similarity.html[Elasticsearch Documentation]
26+
| {ref}/index-modules-similarity.html[Elasticsearch Documentation]
27+
| Weight | <<painless-weight-context, Painless Documentation>>
28+
| {ref}/index-modules-similarity.html[Elasticsearch Documentation]
3229
| Score | <<painless-score-context, Painless Documentation>>
33-
| {es_version}/query-dsl-function-score-query.html[Elasticsearch Documentation]
30+
| {ref}/query-dsl-function-score-query.html[Elasticsearch Documentation]
3431
| Field | <<painless-field-context, Painless Documentation>>
35-
| {es_version}/search-request-script-fields.html[Elasticsearch Documentation]
32+
| {ref}/search-request-script-fields.html[Elasticsearch Documentation]
3633
| Filter | <<painless-filter-context, Painless Documentation>>
37-
| {es_version}/query-dsl-script-query.html[Elasticsearch Documentation]
34+
| {ref}/query-dsl-script-query.html[Elasticsearch Documentation]
3835
| Minimum should match | <<painless-min-should-match-context, Painless Documentation>>
39-
| {es_version}/query-dsl-terms-set-query.html[Elasticsearch Documentation]
36+
| {ref}/query-dsl-terms-set-query.html[Elasticsearch Documentation]
4037
| Metric aggregation initialization | <<painless-metric-agg-init-context, Painless Documentation>>
41-
| {es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
38+
| {ref}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
4239
| Metric aggregation map | <<painless-metric-agg-map-context, Painless Documentation>>
43-
| {es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
40+
| {ref}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
4441
| Metric aggregation combine | <<painless-metric-agg-combine-context, Painless Documentation>>
45-
| {es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
42+
| {ref}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
4643
| Metric aggregation reduce | <<painless-metric-agg-reduce-context, Painless Documentation>>
47-
| {es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
44+
| {ref}/search-aggregations-metrics-scripted-metric-aggregation.html[Elasticsearch Documentation]
4845
| Bucket aggregation | <<painless-bucket-agg-context, Painless Documentation>>
49-
| {es_version}/search-aggregations-pipeline-bucket-script-aggregation.html[Elasticsearch Documentation]
46+
| {ref}/search-aggregations-pipeline-bucket-script-aggregation.html[Elasticsearch Documentation]
5047
| Ingest processor | <<painless-ingest-processor-context, Painless Documentation>>
51-
| {es_version}/script-processor.html[Elasticsearch Documentation]
48+
| {ref}/script-processor.html[Elasticsearch Documentation]
5249
| Watcher condition | <<painless-watcher-condition-context, Painless Documentation>>
53-
| {xp_version}/condition-script.html[Elasticsearch Documentation]
50+
| {xpack-ref}/condition-script.html[Elasticsearch Documentation]
5451
| Watcher transform | <<painless-watcher-transform-context, Painless Documentation>>
55-
| {xp_version}/transform-script.html[Elasticsearch Documentation]
52+
| {xpack-ref}/transform-script.html[Elasticsearch Documentation]
5653
|====
5754

5855
include::painless-contexts/index.asciidoc[]

docs/painless/painless-contexts/painless-bucket-agg-context.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Bucket aggregation context
33

44
Use a Painless script in an
5-
{es_version}/search-aggregations-pipeline-bucket-script-aggregation.html[bucket aggregation]
5+
{ref}/search-aggregations-pipeline-bucket-script-aggregation.html[bucket aggregation]
66
to calculate a value as a result in a bucket.
77

88
*Variables*

docs/painless/painless-contexts/painless-field-context.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Field context
33

44
Use a Painless script to create a
5-
{es_version}/search-request-script-fields.html[script field] to return
5+
{ref}/search-request-script-fields.html[script field] to return
66
a customized value for each document in the results of a query.
77

88
*Variables*
@@ -14,7 +14,7 @@ a customized value for each document in the results of a query.
1414
Contains the fields of the specified document where each field is a
1515
`List` of values.
1616

17-
{es_version}/mapping-source-field.html[`ctx['_source']`] (`Map`)::
17+
{ref}/mapping-source-field.html[`ctx['_source']`] (`Map`)::
1818
Contains extracted JSON in a `Map` and `List` structure for the fields
1919
existing in a stored document.
2020

docs/painless/painless-contexts/painless-filter-context.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[painless-filter-context]]
22
=== Filter context
33

4-
Use a Painless script as a {es_version}/query-dsl-script-query.html[filter] in a
4+
Use a Painless script as a {ref}/query-dsl-script-query.html[filter] in a
55
query to include and exclude documents.
66

77

docs/painless/painless-contexts/painless-ingest-processor-context.asciidoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[[painless-ingest-processor-context]]
22
=== Ingest processor context
33

4-
Use a Painless script in an {es_version}/script-processor.html[ingest processor]
4+
Use a Painless script in an {ref}/script-processor.html[ingest processor]
55
to modify documents upon insertion.
66

77
*Variables*
88

99
`params` (`Map`, read-only)::
1010
User-defined parameters passed in as part of the query.
1111

12-
{es_version}/mapping-index-field.html[`ctx['_index']`] (`String`)::
12+
{ref}/mapping-index-field.html[`ctx['_index']`] (`String`)::
1313
The name of the index.
1414

15-
{es_version}/mapping-type-field.html[`ctx['_type']`] (`String`)::
15+
{ref}/mapping-type-field.html[`ctx['_type']`] (`String`)::
1616
The type of document within an index.
1717

1818
`ctx` (`Map`)::
@@ -21,10 +21,10 @@ to modify documents upon insertion.
2121

2222
*Side Effects*
2323

24-
{es_version}/mapping-index-field.html[`ctx['_index']`]::
24+
{ref}/mapping-index-field.html[`ctx['_index']`]::
2525
Modify this to change the destination index for the current document.
2626

27-
{es_version}/mapping-type-field.html[`ctx['_type']`]::
27+
{ref}/mapping-type-field.html[`ctx['_type']`]::
2828
Modify this to change the type for the current document.
2929

3030
`ctx` (`Map`, read-only)::

docs/painless/painless-contexts/painless-metric-agg-combine-context.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Metric aggregation combine context
33

44
Use a Painless script to
5-
{es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[combine]
5+
{ref}/search-aggregations-metrics-scripted-metric-aggregation.html[combine]
66
values for use in a scripted metric aggregation. A combine script is run once
77
per shard following a <<painless-metric-agg-map-context, map script>> and is
88
optional as part of a full metric aggregation.

docs/painless/painless-contexts/painless-metric-agg-init-context.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Metric aggregation initialization context
33

44
Use a Painless script to
5-
{es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[initialize]
5+
{ref}/search-aggregations-metrics-scripted-metric-aggregation.html[initialize]
66
values for use in a scripted metric aggregation. An initialization script is
77
run prior to document collection once per shard and is optional as part of the
88
full metric aggregation.

docs/painless/painless-contexts/painless-metric-agg-map-context.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Metric aggregation map context
33

44
Use a Painless script to
5-
{es_version}/search-aggregations-metrics-scripted-metric-aggregation.html[map]
5+
{ref}/search-aggregations-metrics-scripted-metric-aggregation.html[map]
66
values for use in a scripted metric aggregation. A map script is run once per
77
collected document following an optional
88
<<painless-metric-agg-init-context, initialization script>> and is required as

0 commit comments

Comments
 (0)