Skip to content

Commit 67df1d3

Browse files
author
Christoph Büscher
committed
Merge branch 'master' into add-version-field
2 parents 94def20 + daa72fc commit 67df1d3

File tree

216 files changed

+4730
-2081
lines changed

Some content is hidden

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

216 files changed

+4730
-2081
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 8.0.0
2-
lucene = 8.7.0-snapshot-b313618cc1d
2+
lucene = 8.7.0-snapshot-cdfdc1e0851
33

44
bundled_jdk_vendor = adoptopenjdk
55
bundled_jdk = 14.0.1+7

docs/reference/aggregations/metrics/tophits-aggregation.asciidoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ The top_hits aggregation returns regular search hits, because of this many per h
2424
* <<highlighting,Highlighting>>
2525
* <<request-body-search-explain,Explain>>
2626
* <<named-queries,Named queries>>
27+
* <<search-fields-param,Search fields>>
2728
* <<source-filtering,Source filtering>>
2829
* <<stored-fields,Stored fields>>
2930
* <<script-fields,Script fields>>
@@ -41,7 +42,7 @@ by aggregations, use a <<query-dsl-function-score-query,`function_score`>> or
4142

4243
==== Example
4344

44-
In the following example we group the sales by type and per type we show the last sale.
45+
In the following example we group the sales by type and per type we show the last sale.
4546
For each sale only the date and price fields are being included in the source.
4647

4748
[source,console]

docs/reference/data-streams/set-up-a-data-stream.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ template for a data stream must specify:
110110

111111
[IMPORTANT]
112112
====
113-
{es} has built-in index templates for the `metrics-*-*` and `logs-*-*` index
113+
{es} has built-in index templates for the `metrics-*-*`, `logs-*-*`, and `synthetics-*-*` index
114114
patterns, each with a priority of `100`.
115115
{ingest-guide}/ingest-management-overview.html[{agent}] uses these templates to
116116
create data streams. If you use {agent}, assign your index templates a priority

docs/reference/docs/bulk.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ $ curl -s -H "Content-Type: application/x-ndjson" -XPOST localhost:9200/_bulk --
137137

138138
[discrete]
139139
[[bulk-optimistic-concurrency-control]]
140-
===== Optimistic Concurrency Control
140+
===== Optimistic concurrency control
141141

142142
Each `index` and `delete` action within a bulk API call may include the
143143
`if_seq_no` and `if_primary_term` parameters in their respective action
@@ -168,7 +168,7 @@ appropriate backing index for the stream.
168168

169169
[discrete]
170170
[[bulk-wait-for-active-shards]]
171-
===== Wait For Active Shards
171+
===== Wait for active shards
172172

173173
When making bulk calls, you can set the `wait_for_active_shards`
174174
parameter to require a minimum number of shard copies to be active

docs/reference/docs/index_.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ the operation automatically creates the index and applies any matching
171171

172172
[IMPORTANT]
173173
====
174-
{es} has built-in index templates for the `metrics-*-*` and `logs-*-*` index
174+
{es} has built-in index templates for the `metrics-*-*`, `logs-*-*`, and `synthetics-*-*` index
175175
patterns, each with a priority of `100`.
176176
{ingest-guide}/ingest-management-overview.html[{agent}] uses these templates to
177177
create data streams. If you use {agent}, assign your index templates a priority

docs/reference/eql/eql-search-api.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ Defaults to `event.category`, as defined in the {ecs-ref}/ecs-event.html[Elastic
145145
Common Schema (ECS)]. If a data stream or index does not contain the
146146
`event.category` field, this value is required.
147147
+
148-
The event category field is typically mapped as a <<keyword,`keyword`>> or
149-
<<constant-keyword-field-type,constant keyword>> field.
148+
The event category field is typically mapped as a field type in the
149+
<<keyword,`keyword`>> family.
150150

151151
`fetch_size`::
152152
(Optional, integer)

docs/reference/eql/eql.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,9 @@ documents use a different timestamp or event category field, you must specify it
389389
in the search request using the `timestamp_field` or `event_category_field`
390390
parameters.
391391

392-
The event category field is typically mapped as a <<keyword,`keyword`>> or
393-
<<constant-keyword-field-type,constant keyword>> field. The timestamp field is typically
394-
mapped as a <<date,`date`>> or <<date_nanos,`date_nanos`>> field.
392+
The event category field is typically mapped as a field type in the
393+
<<keyword,`keyword`>> family. The timestamp field is typically mapped as a
394+
<<date,`date`>> or <<date_nanos,`date_nanos`>> field.
395395

396396
NOTE: You cannot use a <<nested,`nested`>> field or the sub-fields of a `nested`
397397
field as the timestamp or event category field. See <<eql-nested-fields>>.

docs/reference/eql/functions.asciidoc

Lines changed: 30 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,8 @@ Source string. Empty strings return an empty string (`""`), regardless of the
109109
If using a field as the argument, this parameter supports only the following
110110
field data types:
111111

112-
* <<keyword,`keyword`>>
113-
* <<constant-keyword-field-type,`constant_keyword`>>
114-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
115-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
112+
* A type in the <<keyword,`keyword`>> family
113+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
116114
--
117115

118116
`<left>`::
@@ -125,10 +123,8 @@ whitespace.
125123
If using a field as the argument, this parameter supports only the following
126124
field data types:
127125

128-
* <<keyword,`keyword`>>
129-
* <<constant-keyword-field-type,`constant_keyword`>>
130-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
131-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
126+
* A type in the <<keyword,`keyword`>> family
127+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
132128
--
133129

134130
`<right>`::
@@ -141,10 +137,8 @@ whitespace.
141137
If using a field as the argument, this parameter supports only the following
142138
field data types:
143139

144-
* <<keyword,`keyword`>>
145-
* <<constant-keyword-field-type,`constant_keyword`>>
146-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
147-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
140+
* A type in the <<keyword,`keyword`>> family
141+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
148142
--
149143

150144
`<greedy_matching>`::
@@ -399,10 +393,8 @@ Source string. If `null`, the function returns `null`.
399393
If using a field as the argument, this parameter supports only the following
400394
field data types:
401395

402-
* <<keyword,`keyword`>>
403-
* <<constant-keyword-field-type,`constant_keyword`>>
404-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
405-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
396+
* A type in the <<keyword,`keyword`>> family
397+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
406398
--
407399

408400
`<substring>`::
@@ -414,10 +406,8 @@ Substring to search for. If `null`, the function returns `null`.
414406
If using a field as the argument, this parameter supports only the following
415407
field data types:
416408

417-
* <<keyword,`keyword`>>
418-
* <<constant-keyword-field-type,`constant_keyword`>>
419-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
420-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
409+
* A type in the <<keyword,`keyword`>> family
410+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
421411
--
422412

423413
*Returns:* boolean or `null`
@@ -477,10 +467,8 @@ Source string. If `null`, the function returns `null`.
477467
If using a field as the argument, this parameter supports only the following
478468
field data types:
479469

480-
* <<keyword,`keyword`>>
481-
* <<constant-keyword-field-type,`constant_keyword`>>
482-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
483-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
470+
* A type in the <<keyword,`keyword`>> family
471+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
484472
--
485473

486474
`<substring>`::
@@ -498,10 +486,8 @@ Otherwise, empty strings return `0`.
498486
If using a field as the argument, this parameter supports only the following
499487
field data types:
500488

501-
* <<keyword,`keyword`>>
502-
* <<constant-keyword-field-type,`constant_keyword`>>
503-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
504-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
489+
* A type in the <<keyword,`keyword`>> family
490+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
505491
--
506492

507493
`<start_pos>`::
@@ -564,10 +550,8 @@ String for which to return the character length. If `null`, the function returns
564550
If using a field as the argument, this parameter supports only the following
565551
field data types:
566552

567-
* <<keyword,`keyword`>>
568-
* <<constant-keyword-field-type,`constant_keyword`>>
569-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
570-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
553+
* A type in the <<keyword,`keyword`>> family
554+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
571555
--
572556

573557
*Returns:* integer or `null`
@@ -614,10 +598,8 @@ Source string. If `null`, the function returns `null`.
614598
If using a field as the argument, this parameter supports only the following
615599
field data types:
616600

617-
* <<keyword,`keyword`>>
618-
* <<constant-keyword-field-type,`constant_keyword`>>
619-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
620-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
601+
* A type in the <<keyword,`keyword`>> family
602+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
621603
--
622604

623605
`<reg_exp>`::
@@ -811,10 +793,8 @@ ignored. Empty strings (`""`) are not supported.
811793
If using a field as the argument, this parameter supports only the following
812794
field data types:
813795

814-
* <<keyword,`keyword`>>
815-
* <<constant-keyword-field-type,`constant_keyword`>>
816-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
817-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
796+
* A type in the <<keyword,`keyword`>> family
797+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
818798

819799
If this argument is `null`, the function returns `null`.
820800
--
@@ -879,10 +859,8 @@ Source string. If `null`, the function returns `null`.
879859
If using a field as the argument, this parameter supports only the following
880860
field data types:
881861

882-
* <<keyword,`keyword`>>
883-
* <<constant-keyword-field-type,`constant_keyword`>>
884-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
885-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
862+
* A type in the <<keyword,`keyword`>> family
863+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
886864
--
887865

888866
`<substring>`::
@@ -894,10 +872,8 @@ Substring to search for. If `null`, the function returns `null`.
894872
If using a field as the argument, this parameter supports only the following
895873
field data types:
896874

897-
* <<keyword,`keyword`>>
898-
* <<constant-keyword-field-type,`constant_keyword`>>
899-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
900-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
875+
* A type in the <<keyword,`keyword`>> family
876+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
901877
--
902878

903879
*Returns:* boolean or `null`
@@ -978,10 +954,8 @@ Source string to search. If `null`, the function returns `null`.
978954
If using a field as the argument, this parameter supports only the following
979955
field data types:
980956

981-
* <<keyword,`keyword`>>
982-
* <<constant-keyword-field-type,`constant_keyword`>>
983-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
984-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
957+
* A type in the <<keyword,`keyword`>> family
958+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
985959

986960
`<substring>`::
987961
(Required, string or `null`)
@@ -990,10 +964,8 @@ Substring to search for. If `null`, the function returns `null`.
990964
If using a field as the argument, this parameter supports only the following
991965
field data types:
992966

993-
* <<keyword,`keyword`>>
994-
* <<constant-keyword-field-type,`constant_keyword`>>
995-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
996-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
967+
* A type in the <<keyword,`keyword`>> family
968+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
997969

998970
*Returns:* boolean or `null`
999971

@@ -1147,10 +1119,8 @@ Source string. If `null`, the function returns `null`.
11471119
If using a field as the argument, this parameter supports only the following
11481120
field data types:
11491121

1150-
* <<keyword,`keyword`>>
1151-
* <<constant-keyword-field-type,`constant_keyword`>>
1152-
* <<text,`text`>> field with a <<keyword,`keyword`>> or
1153-
<<constant-keyword-field-type,`constant_keyword`>> sub-field
1122+
* A type in the <<keyword,`keyword`>> family
1123+
* <<text,`text`>> field with a <<keyword,`keyword`>> sub-field
11541124
--
11551125

11561126
`<wildcard_exp>`::

docs/reference/indices/create-index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ PUT /test
156156
--------------------------------------------------
157157

158158
[[create-index-wait-for-active-shards]]
159-
===== Wait For active shards
159+
===== Wait for active shards
160160

161161
By default, index creation will only return a response to the client when the primary copies of
162162
each shard have been started, or the request times out. The index creation response will indicate

docs/reference/indices/index-templates.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ If a new data stream or index matches more than one index template, the index te
2222

2323
[IMPORTANT]
2424
====
25-
{es} has built-in index templates for the `metrics-*-*` and `logs-*-*` index
25+
{es} has built-in index templates for the `metrics-*-*`, `logs-*-*`, and `synthetics-*-*` index
2626
patterns, each with a priority of `100`.
2727
{ingest-guide}/ingest-management-overview.html[{agent}] uses these templates to
2828
create data streams. If you use {agent}, assign your index templates a priority

0 commit comments

Comments
 (0)