Merge branch 'upstream/main' into add-alibabacloud-inference

* upstream/main: (105 commits) Removing the use of watcher stats from WatchAcTests (elastic#111435) Mute org.elasticsearch.xpack.restart.FullClusterRestartIT testSingleDoc {cluster=UPGRADED} elastic#111434 Make `EnrichPolicyRunner` more properly async (elastic#111321) Mute org.elasticsearch.xpack.restart.FullClusterRestartIT testSingleDoc {cluster=OLD} elastic#111430 Mute org.elasticsearch.xpack.esql.expression.function.aggregate.ValuesTests testGroupingAggregate {TestCase=<long unicode KEYWORDs>} elastic#111428 Mute org.elasticsearch.xpack.esql.expression.function.aggregate.ValuesTests testGroupingAggregate {TestCase=<long unicode TEXTs>} elastic#111429 Mute org.elasticsearch.xpack.repositories.metering.azure.AzureRepositoriesMeteringIT org.elasticsearch.xpack.repositories.metering.azure.AzureRepositoriesMeteringIT elastic#111307 Update semantic_text field to support indexing numeric and boolean data types (elastic#111284) Mute org.elasticsearch.repositories.blobstore.testkit.AzureSnapshotRepoTestKitIT testRepositoryAnalysis elastic#111280 Ensure vector similarity correctly limits inner_hits returned for nested kNN (elastic#111363) Fix LogsIndexModeFullClusterRestartIT (elastic#111362) Remove 4096 bool query max limit from docs (elastic#111421) Fix score count validation in reranker response (elastic#111212) Integrate data generator in LogsDB mode challenge test (elastic#111303) ESQL: Add COUNT and COUNT_DISTINCT aggregation tests (elastic#111409) [Service Account] Add AutoOps account (elastic#111316) [ML] Fix failing test DetectionRulesTests.testEqualsAndHashcode (elastic#111351) [ML] Create and inject APM Inference Metrics (elastic#111293) [DOCS] Additional reranking docs updates (elastic#111350) Mute org.elasticsearch.repositories.azure.RepositoryAzureClientYamlTestSuiteIT org.elasticsearch.repositories.azure.RepositoryAzureClientYamlTestSuiteIT elastic#111345 ... # Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java
weizijun · Jul 30, 2024 · f8fa7b9 · f8fa7b9
2 parents 73a5f44 + 1f4788f
commit f8fa7b9
Show file tree

Hide file tree

Showing 434 changed files with 14,076 additions and 4,357 deletions.
diff --git a/docs/changelog/110630.yaml b/docs/changelog/110630.yaml
@@ -0,0 +1,5 @@
+pr: 110630
+summary: Telemetry for inference adaptive allocations
+area: Machine Learning
+type: feature
+issues: []
diff --git a/docs/changelog/110734.yaml b/docs/changelog/110734.yaml
@@ -0,0 +1,5 @@
+pr: 110734
+summary: Fix bug in ML serverless autoscaling which prevented trained model updates from triggering a scale up
+area: Machine Learning
+type: bug
+issues: [ ]
diff --git a/docs/changelog/110816.yaml b/docs/changelog/110816.yaml
@@ -0,0 +1,6 @@
+pr: 110816
+summary: GET _cluster/settings with include_defaults returns the expected fallback value if defined in elasticsearch.yml
+area: Infra/Settings
+type: bug
+issues:
+ - 110815
diff --git a/docs/changelog/110971.yaml b/docs/changelog/110971.yaml
@@ -0,0 +1,5 @@
+pr: 110971
+summary: "Search in ES|QL: Add MATCH operator"
+area: ES|QL
+type: feature
+issues: []
diff --git a/docs/changelog/110974.yaml b/docs/changelog/110974.yaml
@@ -0,0 +1,5 @@
+pr: 110974
+summary: Add custom rule parameters to force time shift
+area: Machine Learning
+type: enhancement
+issues: []
diff --git a/docs/changelog/111071.yaml b/docs/changelog/111071.yaml
@@ -0,0 +1,5 @@
+pr: 111071
+summary: Use native scalar scorer for int8_flat index
+area: Vector Search
+type: enhancement
+issues: []
diff --git a/docs/changelog/111212.yaml b/docs/changelog/111212.yaml
@@ -0,0 +1,6 @@
+pr: 111212
+summary: Fix score count validation in reranker response
+area: Ranking
+type: bug
+issues:
+ - 111202
diff --git a/docs/changelog/111215.yaml b/docs/changelog/111215.yaml
@@ -0,0 +1,6 @@
+pr: 111215
+summary: Make `SnapshotLifecycleStats` immutable so `SnapshotLifecycleMetadata.EMPTY`
+  isn't changed as side-effect
+area: ILM+SLM
+type: bug
+issues: []
diff --git a/docs/changelog/111238.yaml b/docs/changelog/111238.yaml
@@ -0,0 +1,6 @@
+pr: 111238
+summary: Fix validation of TEXT fields with case insensitive comparison
+area: EQL
+type: bug
+issues:
+ - 111235
diff --git a/docs/changelog/111274.yaml b/docs/changelog/111274.yaml
@@ -0,0 +1,5 @@
+pr: 111274
+summary: Include account name in Azure settings exceptions
+area: Snapshot/Restore
+type: enhancement
+issues: []
diff --git a/docs/changelog/111284.yaml b/docs/changelog/111284.yaml
@@ -0,0 +1,6 @@
+pr: 111284
+summary: Update `semantic_text` field to support indexing numeric and boolean data
+  types
+area: Mapping
+type: enhancement
+issues: []
diff --git a/docs/changelog/111290.yaml b/docs/changelog/111290.yaml
@@ -0,0 +1,5 @@
+pr: 111290
+summary: Fix enrich policy runner exception handling on empty segments response
+area: Ingest Node
+type: bug
+issues: []
diff --git a/docs/changelog/111311.yaml b/docs/changelog/111311.yaml
@@ -0,0 +1,6 @@
+pr: 111311
+summary: Adding support for data streams with a match-all template
+area: Data streams
+type: bug
+issues:
+ - 111204
diff --git a/docs/changelog/111316.yaml b/docs/changelog/111316.yaml
@@ -0,0 +1,5 @@
+pr: 111316
+summary: "[Service Account] Add `AutoOps` account"
+area: Security
+type: enhancement
+issues: []
diff --git a/docs/changelog/111363.yaml b/docs/changelog/111363.yaml
@@ -0,0 +1,6 @@
+pr: 111363
+summary: Ensure vector similarity correctly limits `inner_hits` returned for nested
+  kNN
+area: Vector Search
+type: bug
+issues: [111093]
diff --git a/docs/changelog/111366.yaml b/docs/changelog/111366.yaml
@@ -0,0 +1,6 @@
+pr: 111366
+summary: "[Inference API] Replace `model_id` with `inference_id` in inference API\
+  \ except when stored"
+area: Machine Learning
+type: bug
+issues: []
diff --git a/docs/changelog/111367.yaml b/docs/changelog/111367.yaml
@@ -0,0 +1,5 @@
+pr: 111367
+summary: "ESQL: Add Values aggregation tests, fix `ConstantBytesRefBlock` memory handling"
+area: ES|QL
+type: bug
+issues: []
diff --git a/docs/reference/cat/recovery.asciidoc b/docs/reference/cat/recovery.asciidoc
@@ -39,7 +39,7 @@ The cat recovery API returns information about shard recoveries, both
 ongoing and completed. It is a more compact view of the JSON
 <<indices-recovery,index recovery>> API.
 
-include::{es-ref-dir}/indices/recovery.asciidoc[tag=shard-recovery-desc]
+include::{es-ref-dir}/modules/shard-recovery-desc.asciidoc[]
 
 
 [[cat-recovery-path-params]]

diff --git a/docs/reference/esql/esql-multi-index.asciidoc b/docs/reference/esql/esql-multi-index.asciidoc
@@ -103,7 +103,7 @@ FROM events_*
 
 [source,bash]
 ----
-Cannot use field [client_ip] due to ambiguities being mapped as 
+Cannot use field [client_ip] due to ambiguities being mapped as
 [2] incompatible types:
     [ip] in [events_ip],
     [keyword] in [events_keyword]
@@ -113,12 +113,14 @@ Cannot use field [client_ip] due to ambiguities being mapped as
 [[esql-multi-index-union-types]]
 === Union types
 
+experimental::[]
+
 {esql} has a way to handle <<esql-multi-index-invalid-mapping, field type mismatches>>. When the same field is mapped to multiple types in multiple indices,
 the type of the field is understood to be a _union_ of the various types in the index mappings.
 As seen in the preceding examples, this _union type_ cannot be used in the results,
 and cannot be referred to by the query
 -- except when it's passed to a type conversion function that accepts all the types in the _union_ and converts the field
-to a single type. {esql} offers a suite of <<esql-type-conversion-functions,type conversion functions>> to achieve this. 
+to a single type. {esql} offers a suite of <<esql-type-conversion-functions,type conversion functions>> to achieve this.
 
 In the above examples, the query can use a command like `EVAL client_ip = TO_IP(client_ip)` to resolve
 the union of `ip` and `keyword` to just `ip`.

diff --git a/docs/reference/esql/functions/aggregation-functions.asciidoc b/docs/reference/esql/functions/aggregation-functions.asciidoc
@@ -9,30 +9,30 @@ The <<esql-stats-by>> command supports these aggregate functions:
 
 // tag::agg_list[]
 * <<esql-avg>>
-* <<esql-agg-count>>
-* <<esql-agg-count-distinct>>
+* <<esql-count>>
+* <<esql-count_distinct>>
 * <<esql-max>>
-* <<esql-agg-median>>
-* <<esql-agg-median-absolute-deviation>>
+* <<esql-median>>
+* <<esql-median_absolute_deviation>>
 * <<esql-min>>
 * <<esql-percentile>>
-* experimental:[] <<esql-agg-st-centroid>>
+* experimental:[] <<esql-st_centroid_agg>>
 * <<esql-sum>>
 * <<esql-top>>
-* <<esql-agg-values>>
+* <<esql-values>>
 * experimental:[] <<esql-agg-weighted-avg>>
 // end::agg_list[]
 
-include::count.asciidoc[]
-include::count-distinct.asciidoc[]
-include::median.asciidoc[]
-include::median-absolute-deviation.asciidoc[]
-include::st_centroid_agg.asciidoc[]
 include::layout/avg.asciidoc[]
+include::layout/count.asciidoc[]
+include::layout/count_distinct.asciidoc[]
 include::layout/max.asciidoc[]
+include::layout/median.asciidoc[]
+include::layout/median_absolute_deviation.asciidoc[]
 include::layout/min.asciidoc[]
 include::layout/percentile.asciidoc[]
+include::layout/st_centroid_agg.asciidoc[]
 include::layout/sum.asciidoc[]
 include::layout/top.asciidoc[]
-include::values.asciidoc[]
+include::layout/values.asciidoc[]
 include::weighted-avg.asciidoc[]
diff --git a/docs/reference/esql/functions/appendix/count_distinct.asciidoc b/docs/reference/esql/functions/appendix/count_distinct.asciidoc
diff --git a/docs/reference/esql/functions/appendix/median.asciidoc b/docs/reference/esql/functions/appendix/median.asciidoc
diff --git a/docs/reference/esql/functions/appendix/median_absolute_deviation.asciidoc b/docs/reference/esql/functions/appendix/median_absolute_deviation.asciidoc
diff --git a/docs/reference/esql/functions/appendix/values.asciidoc b/docs/reference/esql/functions/appendix/values.asciidoc
diff --git a/docs/reference/esql/functions/count-distinct.asciidoc b/docs/reference/esql/functions/count-distinct.asciidoc
diff --git a/docs/reference/esql/functions/description/count.asciidoc b/docs/reference/esql/functions/description/count.asciidoc
diff --git a/docs/reference/esql/functions/description/count_distinct.asciidoc b/docs/reference/esql/functions/description/count_distinct.asciidoc
diff --git a/docs/reference/esql/functions/description/median.asciidoc b/docs/reference/esql/functions/description/median.asciidoc
diff --git a/docs/reference/esql/functions/description/median_absolute_deviation.asciidoc b/docs/reference/esql/functions/description/median_absolute_deviation.asciidoc
diff --git a/docs/reference/esql/functions/description/st_centroid_agg.asciidoc b/docs/reference/esql/functions/description/st_centroid_agg.asciidoc
diff --git a/docs/reference/esql/functions/description/values.asciidoc b/docs/reference/esql/functions/description/values.asciidoc