Merge

n1v0lg · Aug 30, 2023 · df2c9a8 · df2c9a8
2 parents 1121138 + b6c85db
commit df2c9a8
Show file tree

Hide file tree

Showing 292 changed files with 1,210 additions and 819 deletions.
diff --git a/branches.json b/branches.json
@@ -0,0 +1,17 @@
+{
+  "notice": "This file is not maintained outside of the main branch and should only be used for tooling.",
+  "branches": [
+    {
+      "branch": "main"
+    },
+    {
+      "branch": "8.10"
+    },
+    {
+      "branch": "8.9"
+    },
+    {
+      "branch": "7.17"
+    }
+  ]
+}
diff --git a/docs/changelog/98961.yaml b/docs/changelog/98961.yaml
@@ -0,0 +1,5 @@
+pr: 98961
+summary: Fix NPE when `GetUser` with profile uid before profile index exists
+area: Security
+type: bug
+issues: []
diff --git a/docs/reference/esql/index.asciidoc b/docs/reference/esql/index.asciidoc
@@ -95,9 +95,8 @@ POST /_query?format=txt
 [discrete]
 ==== {kib}
 
-{esql} can be used in Discover to explore a data set, and in Lens to visualize it.
-First, enable the `enableTextBased` setting in *Advanced Settings*. Next, in
-Discover or Lens, from the data view dropdown, select *{esql}*.
+Use {esql} in Discover to explore a data set. From the data view dropdown,
+select *Try {esql}* to get started.
 
 NOTE: {esql} queries in Discover and Lens are subject to the time range selected
 with the time filter.

diff --git a/docs/reference/modules/threadpool.asciidoc b/docs/reference/modules/threadpool.asciidoc
@@ -42,7 +42,7 @@ There are several thread pools, but the important ones include:
     size of `16`.
 
 `write`::
-    For single-document index/delete/update and bulk requests. Thread pool type
+    For single-document index/delete/update, ingest processors, and bulk requests. Thread pool type
     is `fixed` with a size of <<node.processors, `# of allocated processors`>>,
     queue_size of `10000`. The maximum size for this pool is
     `pass:[1 + ]`<<node.processors, `# of allocated processors`>>.

diff --git a/docs/reference/search/search-your-data/semantic-search-elser.asciidoc b/docs/reference/search/search-your-data/semantic-search-elser.asciidoc
@@ -361,3 +361,9 @@ PUT my-index
 * {ml-docs}/ml-nlp-elser.html[How to download and deploy ELSER]
 * {ml-docs}/ml-nlp-limitations.html#ml-nlp-elser-v1-limit-512[ELSER v1 limitation]
 * https://www.elastic.co/blog/may-2023-launch-information-retrieval-elasticsearch-ai-model[Improving information retrieval in the Elastic Stack: Introducing Elastic Learned Sparse Encoder, our new retrieval model]
+
+[discrete]
+[[interactive-example]]
+==== Interactive example
+
+* The `elasticsearch-labs` repo has an interactive example of running https://github.com/elastic/elasticsearch-labs/blob/main/notebooks/search/03-ELSER.ipynb[ELSER-powered semantic search] using the {es} Python client.
diff --git a/docs/reference/search/search-your-data/semantic-search.asciidoc b/docs/reference/search/search-your-data/semantic-search.asciidoc
@@ -131,5 +131,7 @@ include::{es-repo-dir}/tab-widgets/semantic-search/hybrid-search-widget.asciidoc
 *** {blog-ref}improving-information-retrieval-elastic-stack-benchmarking-passage-retrieval[Part 2: Benchmarking passage retrieval]
 *** {blog-ref}may-2023-launch-information-retrieval-elasticsearch-ai-model[Part 3: Introducing Elastic Learned Sparse Encoder, our new retrieval model]
 *** {blog-ref}improving-information-retrieval-elastic-stack-hybrid[Part 4: Hybrid retrieval]
+* Interactive examples:
+** The https://github.com/elastic/elasticsearch-labs[`elasticsearch-labs`] repo contains a number of interactive semantic search examples in the form of executable Python notebooks, using the {es} Python client
 
-include::semantic-search-elser.asciidoc[]
+include::semantic-search-elser.asciidoc[]
diff --git a/docs/reference/troubleshooting/common-issues/hotspotting.asciidoc b/docs/reference/troubleshooting/common-issues/hotspotting.asciidoc
@@ -259,8 +259,14 @@ direct indices:data/read/eql 10m           node_1  true
 // TEST[skip:illustrative response only]
 
 This surfaces a problematic <<eql-search-api,EQL query>>. We can gain 
-further insight on it via <<tasks,the task management API>>. Its response 
-contains a `description` that reports this query:
+further insight on it via <<tasks,the task management API>>,
+
+[source,console]
+----
+GET _tasks?human&detailed
+----
+
+Its response contains a `description` that reports this query:
 
 [source,eql]
 ----

diff --git a/.../main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java b/.../main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java
@@ -237,7 +237,7 @@ public InternalAutoDateHistogram(StreamInput in) throws IOException {
     protected void doWriteTo(StreamOutput out) throws IOException {
         bucketInfo.writeTo(out);
         out.writeNamedWriteable(format);
-        out.writeList(buckets);
+        out.writeCollection(buckets);
         out.writeVInt(targetBuckets);
         if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_3_0)) {
             out.writeVLong(bucketInnerInterval);

diff --git a/...in/java/org/elasticsearch/aggregations/pipeline/BucketSortPipelineAggregationBuilder.java b/...in/java/org/elasticsearch/aggregations/pipeline/BucketSortPipelineAggregationBuilder.java
@@ -100,7 +100,7 @@ public BucketSortPipelineAggregationBuilder(StreamInput in) throws IOException {
 
     @Override
     protected void doWriteTo(StreamOutput out) throws IOException {
-        out.writeList(sorts);
+        out.writeCollection(sorts);
         out.writeVInt(from);
         out.writeOptionalVInt(size);
         gapPolicy.writeTo(out);

diff --git a/...java/org/elasticsearch/datastreams/lifecycle/action/ExplainDataStreamLifecycleAction.java b/...java/org/elasticsearch/datastreams/lifecycle/action/ExplainDataStreamLifecycleAction.java
@@ -165,7 +165,7 @@ public RolloverConfiguration getRolloverConfiguration() {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            out.writeList(indices);
+            out.writeCollection(indices);
             out.writeOptionalWriteable(rolloverConfiguration);
         }
 

diff --git a/...ain/java/org/elasticsearch/datastreams/lifecycle/action/GetDataStreamLifecycleAction.java b/...ain/java/org/elasticsearch/datastreams/lifecycle/action/GetDataStreamLifecycleAction.java
@@ -205,7 +205,7 @@ public RolloverConfiguration getRolloverConfiguration() {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            out.writeList(dataStreamLifecycles);
+            out.writeCollection(dataStreamLifecycles);
             out.writeOptionalWriteable(rolloverConfiguration);
         }
 

diff --git a/...-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java b/...-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStatsAction.java
@@ -103,7 +103,7 @@ protected List<NodeResponse> readNodesFrom(StreamInput in) throws IOException {
 
         @Override
         protected void writeNodesTo(StreamOutput out, List<NodeResponse> nodes) throws IOException {
-            out.writeList(nodes);
+            out.writeCollection(nodes);
         }
 
         @Override

diff --git a/...-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java b/...-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java
@@ -116,7 +116,7 @@ public MultiSearchTemplateRequest indicesOptions(IndicesOptions indicesOptions)
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeVInt(maxConcurrentSearchRequests);
-        out.writeList(requests);
+        out.writeCollection(requests);
     }
 
     @Override

diff --git a/...ng-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextClassInfo.java b/...ng-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextClassInfo.java
@@ -135,11 +135,11 @@ public PainlessContextClassInfo(StreamInput in) throws IOException {
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(name);
         out.writeBoolean(imported);
-        out.writeList(constructors);
-        out.writeList(staticMethods);
-        out.writeList(methods);
-        out.writeList(staticFields);
-        out.writeList(fields);
+        out.writeCollection(constructors);
+        out.writeCollection(staticMethods);
+        out.writeCollection(methods);
+        out.writeCollection(staticFields);
+        out.writeCollection(fields);
     }
 
     public static PainlessContextClassInfo fromXContent(XContentParser parser) {

diff --git a/...es/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextInfo.java b/...es/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextInfo.java
@@ -157,10 +157,10 @@ public PainlessContextInfo(StreamInput in) throws IOException {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(name);
-        out.writeList(classes);
-        out.writeList(importedMethods);
-        out.writeList(classBindings);
-        out.writeList(instanceBindings);
+        out.writeCollection(classes);
+        out.writeCollection(importedMethods);
+        out.writeCollection(classBindings);
+        out.writeCollection(instanceBindings);
     }
 
     public static PainlessContextInfo fromXContent(XContentParser parser) {

diff --git a/...ainless/src/yamlRestTest/resources/rest-api-spec/test/painless/140_dense_vector_basic.yml b/...ainless/src/yamlRestTest/resources/rest-api-spec/test/painless/140_dense_vector_basic.yml
@@ -12,6 +12,7 @@ setup:
             properties:
               vector:
                  type: dense_vector
+                 index: false
                  dims: 5
               indexed_vector:
                 type: dense_vector

diff --git a/...ss/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml b/...ss/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml
@@ -14,6 +14,7 @@ setup:
             properties:
               vector:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 5
               indexed_vector:

diff --git a/...painless/src/yamlRestTest/resources/rest-api-spec/test/painless/150_dense_vector_l1l2.yml b/...painless/src/yamlRestTest/resources/rest-api-spec/test/painless/150_dense_vector_l1l2.yml
@@ -11,6 +11,7 @@ setup:
           mappings:
             properties:
               my_dense_vector:
+                 index: false
                  type: dense_vector
                  dims: 5
   - do:

diff --git a/...ess/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml b/...ess/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml
@@ -13,6 +13,7 @@ setup:
           mappings:
             properties:
               my_dense_vector:
+                index: false
                 type: dense_vector
                 element_type: byte
                 dims: 5

diff --git a/...src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml b/...src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml
@@ -13,6 +13,7 @@ setup:
             properties:
               vector:
                 type: dense_vector
+                index: false
                 dims: 3
               indexed_vector:
                 type: dense_vector

diff --git a/...amlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml b/...amlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml
@@ -15,6 +15,7 @@ setup:
             properties:
               vector:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 3
               indexed_vector:

diff --git a/...src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml b/...src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml
@@ -7,6 +7,7 @@
           mappings:
             properties:
               v:
+                index: false
                 type: dense_vector
                 dims: 3
 

diff --git a/...amlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml b/...amlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml
@@ -13,6 +13,7 @@ setup:
             properties:
               v:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 3
 

diff --git a/...c/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml b/...c/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml
@@ -14,6 +14,7 @@
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 dims: 3
               knn:
                 type: dense_vector
@@ -100,6 +101,7 @@
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 dims: 3
               knn:
                 type: dense_vector
@@ -186,6 +188,7 @@
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 dims: 3
               knn:
                 type: dense_vector
@@ -306,6 +309,7 @@
               bdv:
                 type: dense_vector
                 dims: 3
+                index: false
               knn:
                 type: dense_vector
                 dims: 3
@@ -423,6 +427,7 @@
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 dims: 3
               knn:
                 type: dense_vector
@@ -499,6 +504,7 @@
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 dims: 3
               knn:
                 type: dense_vector
@@ -601,6 +607,7 @@
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 dims: 3
               knn:
                 type: dense_vector
@@ -719,6 +726,7 @@
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 dims: 3
               knn:
                 type: dense_vector
@@ -817,6 +825,7 @@
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 dims: 3
               knn:
                 type: dense_vector

diff --git a/...lRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml b/...lRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml
@@ -15,6 +15,7 @@ setup:
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 3
               knn:
@@ -99,6 +100,7 @@ setup:
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 dims: 3
               knn:
                 type: dense_vector
@@ -181,6 +183,7 @@ setup:
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 3
               knn:
@@ -298,6 +301,7 @@ setup:
               bdv:
                 type: dense_vector
                 element_type: byte
+                index: false
                 dims: 3
               knn:
                 type: dense_vector
@@ -411,6 +415,7 @@ setup:
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 3
               knn:
@@ -485,6 +490,7 @@ setup:
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 3
               knn:
@@ -583,6 +589,7 @@ setup:
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 3
               knn:
@@ -697,6 +704,7 @@ setup:
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 3
               knn:
@@ -792,6 +800,7 @@ setup:
             properties:
               bdv:
                 type: dense_vector
+                index: false
                 element_type: byte
                 dims: 3
               knn:

diff --git a/...legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/MultiLineStringBuilder.java b/...legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/MultiLineStringBuilder.java
@@ -49,7 +49,7 @@ public MultiLineStringBuilder() {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeList(lines);
+        out.writeCollection(lines);
     }
 
     public MultiLineStringBuilder linestring(LineStringBuilder line) {

diff --git a/...es/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/MultiPolygonBuilder.java b/...es/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/MultiPolygonBuilder.java
@@ -63,7 +63,7 @@ public MultiPolygonBuilder(StreamInput in) throws IOException {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         orientation.writeTo(out);
-        out.writeList(polygons);
+        out.writeCollection(polygons);
     }
 
     public Orientation orientation() {