Merge branch 'main' into query-roles

albertzaharovits · Jun 11, 2024 · d8698da · d8698da
2 parents aa7223b + 394d2b0
commit d8698da
Show file tree

Hide file tree

Showing 97 changed files with 3,378 additions and 3,019 deletions.
diff --git a/docs/build.gradle b/docs/build.gradle
@@ -36,6 +36,15 @@ ext.docsFileTree = fileTree(projectDir) {
   }
 }
 
+tasks.named("yamlRestTest") {
+  if (BuildParams.isSnapshotBuild() == false) {
+    // LOOKUP is not available in snapshots
+    systemProperty 'tests.rest.blacklist', [
+      "reference/esql/processing-commands/lookup/esql-lookup-example"
+    ].join(',')
+  }
+}
+
 /* List of files that have snippets that will not work until platinum tests can occur ... */
 tasks.named("buildRestTests").configure {
   getExpectedUnconvertedCandidates().addAll(

diff --git a/docs/changelog/108421.yaml b/docs/changelog/108421.yaml
@@ -0,0 +1,6 @@
+pr: 108421
+summary: "[ES|QL] Support Named and Positional Parameters in `EsqlQueryRequest`"
+area: ES|QL
+type: enhancement
+issues:
+ - 107029
diff --git a/docs/reference/esql/esql-get-started.asciidoc b/docs/reference/esql/esql-get-started.asciidoc
@@ -15,9 +15,10 @@ This getting started is also available as an https://github.com/elastic/elastics
 [[esql-getting-started-prerequisites]]
 === Prerequisites
 
-To follow along with the queries in this guide, you'll need an {es} deployment with our sample data.
+To follow along with the queries in this guide, you can either set up your own
+deployment, or use Elastic's public {esql} demo environment.
 
-include::{es-ref-dir}/tab-widgets/esql/esql-getting-started-sample-data.asciidoc[tag=own-deployment]
+include::{es-ref-dir}/tab-widgets/esql/esql-getting-started-widget-sample-data.asciidoc[]
 
 [discrete]
 [[esql-getting-started-running-queries]]
@@ -268,8 +269,7 @@ Before you can use `ENRICH`, you first need to
 <<esql-create-enrich-policy,create>> and <<esql-execute-enrich-policy,execute>>
 an <<esql-enrich-policy,enrich policy>>.
 
-include::{es-ref-dir}/tab-widgets/esql/esql-getting-started-enrich-policy.asciidoc[tag=own-deployment]
-
+include::{es-ref-dir}/tab-widgets/esql/esql-getting-started-widget-enrich-policy.asciidoc[]
 
 After creating and executing a policy, you can use it with the `ENRICH`
 command:

diff --git a/docs/reference/esql/processing-commands/lookup.asciidoc b/docs/reference/esql/processing-commands/lookup.asciidoc
@@ -27,7 +27,7 @@ adding the other fields from the `table` to the output.
 *Examples*
 
 // tag::examples[]
-[source,console]
+[source,console,id=esql-lookup-example]
 ----
 POST /_query?format=txt
 {
@@ -40,8 +40,8 @@ POST /_query?format=txt
   """,
   "tables": {
     "era": {
-      "author:keyword": ["Frank Herbert", "Peter F. Hamilton", "Vernor Vinge", "Alastair Reynolds", "James S.A. Corey"],
-      "era:keyword"   : [ "The New Wave",           "Diamond",      "Diamond",           "Diamond",           "Hadron"]
+      "author": {"keyword": ["Frank Herbert", "Peter F. Hamilton", "Vernor Vinge", "Alastair Reynolds", "James S.A. Corey"]},
+      "era":    {"keyword": [ "The New Wave",           "Diamond",      "Diamond",           "Diamond",           "Hadron"]}
     }
   }
 }

diff --git a/docs/reference/settings/security-settings.asciidoc b/docs/reference/settings/security-settings.asciidoc
@@ -23,7 +23,9 @@ For more information about creating and updating the {es} keystore, see
 ==== General security settings
 `xpack.security.enabled`::
 (<<static-cluster-setting,Static>>)
-Defaults to `true`, which enables {es} {security-features} on the node. +
+Defaults to `true`, which enables {es} {security-features} on the node. 
+This setting must be enabled to use Elasticsearch's authentication, 
+authorization and audit features. +
 +
 --
 If set to `false`, {security-features} are disabled, which is not recommended.

diff --git a/docs/reference/tab-widgets/esql/esql-getting-started-sample-data.asciidoc b/docs/reference/tab-widgets/esql/esql-getting-started-sample-data.asciidoc
@@ -1,6 +1,6 @@
 // tag::own-deployment[]
 
-First, you'll need to ingest the sample data. In {kib}, open the main menu and select *Dev
+First ingest some sample data. In {kib}, open the main menu and select *Dev
 Tools*. Run the following two requests:
 
 [source,console]

diff --git a/muted-tests.yml b/muted-tests.yml
@@ -59,9 +59,8 @@ tests:
 - class: org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvAppendTests
   method: testEvaluateBlockWithoutNulls {TestCase=<cartesian_shape>, <cartesian_shape>}
   issue: https://github.com/elastic/elasticsearch/issues/109409
-- class: "org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT"
-  issue: "https://github.com/elastic/elasticsearch/issues/109478"
-  method: "test {yaml=reference/esql/processing-commands/lookup/line_31}"
+- class: DenseVectorMappingUpdateIT
+  issue: "https://github.com/elastic/elasticsearch/issues/109571"
 
 # Examples:
 #

diff --git a/qa/apm/build.gradle b/qa/apm/build.gradle
diff --git a/qa/apm/config/elasticsearch/roles.yml b/qa/apm/config/elasticsearch/roles.yml
diff --git a/qa/apm/config/elasticsearch/service_tokens b/qa/apm/config/elasticsearch/service_tokens
diff --git a/qa/apm/config/elasticsearch/users b/qa/apm/config/elasticsearch/users
diff --git a/qa/apm/config/elasticsearch/users_roles b/qa/apm/config/elasticsearch/users_roles
diff --git a/qa/apm/config/kibana/kibana-8.yml b/qa/apm/config/kibana/kibana-8.yml