Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into scripted_metric_all…
Browse files Browse the repository at this point in the history
…ow_list
  • Loading branch information
alex-spies committed Jun 11, 2024
2 parents 7a7efbf + 6d7c9a0 commit 7d70305
Show file tree
Hide file tree
Showing 129 changed files with 3,618 additions and 3,181 deletions.
9 changes: 9 additions & 0 deletions docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog/108421.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 108421
summary: "[ES|QL] Support Named and Positional Parameters in `EsqlQueryRequest`"
area: ES|QL
type: enhancement
issues:
- 107029
5 changes: 5 additions & 0 deletions docs/changelog/108895.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 108895
summary: Add permission to secure access to certain config files specified by settings
area: "Security"
type: bug
issues: []
8 changes: 4 additions & 4 deletions docs/reference/esql/esql-get-started.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions docs/reference/esql/processing-commands/lookup.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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"]}
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion docs/reference/settings/security-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ public Collection<SystemIndexDescriptor> getSystemIndexDescriptors(Settings sett
.setSettings(
Settings.builder()
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
.put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-1")
.build()
)
Expand Down
5 changes: 2 additions & 3 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
#
Expand Down
44 changes: 0 additions & 44 deletions qa/apm/build.gradle

This file was deleted.

34 changes: 0 additions & 34 deletions qa/apm/config/elasticsearch/roles.yml

This file was deleted.

2 changes: 0 additions & 2 deletions qa/apm/config/elasticsearch/service_tokens

This file was deleted.

9 changes: 0 additions & 9 deletions qa/apm/config/elasticsearch/users

This file was deleted.

13 changes: 0 additions & 13 deletions qa/apm/config/elasticsearch/users_roles

This file was deleted.

78 changes: 0 additions & 78 deletions qa/apm/config/kibana/kibana-8.yml

This file was deleted.

Loading

0 comments on commit 7d70305

Please sign in to comment.