Skip to content

Commit

Permalink
Merge branch 'elastic:main' into requireAtLeastOneMatch-only-needed-f…
Browse files Browse the repository at this point in the history
…or-aggs
  • Loading branch information
piergm authored Oct 24, 2024
2 parents 3d02124 + e0a4584 commit d1e9ce0
Show file tree
Hide file tree
Showing 152 changed files with 2,598 additions and 2,138 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
import org.apache.commons.io.IOUtils;
import org.elasticsearch.gradle.OS;
import org.elasticsearch.gradle.util.GradleUtils;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
Expand Down Expand Up @@ -61,7 +62,7 @@ public void apply(Project target) {
? System.getenv("BUILD_NUMBER")
: System.getenv("BUILDKITE_BUILD_NUMBER");
String performanceTest = System.getenv("BUILD_PERFORMANCE_TEST");
if (buildNumber != null && performanceTest == null && GradleUtils.isIncludedBuild(target) == false) {
if (buildNumber != null && performanceTest == null && GradleUtils.isIncludedBuild(target) == false && OS.current() != OS.WINDOWS) {
File targetFile = calculateTargetFile(target, buildNumber);
File projectDir = target.getProjectDir();
File gradleWorkersDir = new File(target.getGradle().getGradleUserHomeDir(), "workers/");
Expand Down
5 changes: 5 additions & 0 deletions docs/changelog/114566.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 114566
summary: Use Azure blob batch API to delete blobs in batches
area: Distributed
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/115041.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 115041
summary: Increase default `queue_capacity` to 10_000 and decrease max `queue_capacity`
to 100_000
area: Machine Learning
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/115061.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 115061
summary: "[ES|QL] Simplify syntax of named parameter for identifier and pattern"
area: ES|QL
type: bug
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/115241.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 115241
summary: "[Security Solution] Add `create_index` to `kibana_system` role for index/DS\
\ `.logs-endpoint.action.responses-*`"
area: Authorization
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/115308.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 115308
summary: "ESQL: Disable pushdown of WHERE past STATS"
area: ES|QL
type: bug
issues:
- 115281
6 changes: 6 additions & 0 deletions docs/changelog/115312.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 115312
summary: "ESQL: Fix filtered grouping on ords"
area: ES|QL
type: bug
issues:
- 114897
5 changes: 5 additions & 0 deletions docs/changelog/115383.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 115383
summary: Only publish desired balance gauges on master
area: Allocation
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/115404.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 115404
summary: Fix NPE in Get Deployment Stats
area: Machine Learning
type: bug
issues: []
9 changes: 9 additions & 0 deletions docs/changelog/115414.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pr: 115414
summary: Mitigate IOSession timeouts
area: Machine Learning
type: bug
issues:
- 114385
- 114327
- 114105
- 114232
2 changes: 1 addition & 1 deletion docs/reference/cat/trainedmodel.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=cat-v]

[source,console]
--------------------------------------------------
GET _cat/ml/trained_models?h=c,o,l,ct,v&v=ture
GET _cat/ml/trained_models?h=c,o,l,ct,v&v=true
--------------------------------------------------
// TEST[skip:kibana sample data]

Expand Down
31 changes: 20 additions & 11 deletions docs/reference/esql/esql-process-data-with-dissect-grok.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ delimiter-based pattern, and extracts the specified keys as columns.
For example, the following pattern:
[source,txt]
----
%{clientip} [%{@timestamp}] %{status}
%{clientip} [%{@timestamp}] %{status}
----

matches a log line of this format:
Expand Down Expand Up @@ -76,8 +76,8 @@ ignore certain fields, append fields, skip over padding, etc.
===== Terminology

dissect pattern::
the set of fields and delimiters describing the textual
format. Also known as a dissection.
the set of fields and delimiters describing the textual
format. Also known as a dissection.
The dissection is described using a set of `%{}` sections:
`%{a} - %{b} - %{c}`

Expand All @@ -91,14 +91,14 @@ Any set of characters other than `%{`, `'not }'`, or `}` is a delimiter.
key::
+
--
the text between the `%{` and `}`, exclusive of the `?`, `+`, `&` prefixes
and the ordinal suffix.
the text between the `%{` and `}`, exclusive of the `?`, `+`, `&` prefixes
and the ordinal suffix.

Examples:

* `%{?aaa}` - the key is `aaa`
* `%{+bbb/3}` - the key is `bbb`
* `%{&ccc}` - the key is `ccc`
* `%{?aaa}` - the key is `aaa`
* `%{+bbb/3}` - the key is `bbb`
* `%{&ccc}` - the key is `ccc`
--

[[esql-dissect-examples]]
Expand Down Expand Up @@ -218,7 +218,7 @@ Putting it together as an {esql} query:

[source.merge.styled,esql]
----
include::{esql-specs}/docs.csv-spec[tag=grokWithEscape]
include::{esql-specs}/docs.csv-spec[tag=grokWithEscapeTripleQuotes]
----

`GROK` adds the following columns to the input table:
Expand All @@ -239,15 +239,24 @@ with a `\`. For example, in the earlier pattern:
%{IP:ip} \[%{TIMESTAMP_ISO8601:@timestamp}\] %{GREEDYDATA:status}
----
In {esql} queries, the backslash character itself is a special character that
In {esql} queries, when using single quotes for strings, the backslash character itself is a special character that
needs to be escaped with another `\`. For this example, the corresponding {esql}
query becomes:
[source.merge.styled,esql]
----
include::{esql-specs}/docs.csv-spec[tag=grokWithEscape]
----
For this reason, in general it is more convenient to use triple quotes `"""` for GROK patterns,
that do not require escaping for backslash.
[source.merge.styled,esql]
----
include::{esql-specs}/docs.csv-spec[tag=grokWithEscapeTripleQuotes]
----
====


[[esql-grok-patterns]]
===== Grok patterns

Expand Down Expand Up @@ -318,4 +327,4 @@ as the `GROK` command.
The `GROK` command does not support configuring <<custom-patterns,custom
patterns>>, or <<trace-match,multiple patterns>>. The `GROK` command is not
subject to <<grok-watchdog,Grok watchdog settings>>.
// end::grok-limitations[]
// end::grok-limitations[]
2 changes: 1 addition & 1 deletion docs/reference/esql/functions/kibana/definition/like.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/esql/functions/kibana/definition/rlike.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/esql/functions/kibana/docs/like.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/esql/functions/kibana/docs/rlike.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions docs/reference/esql/functions/like.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,20 @@ include::{esql-specs}/docs.csv-spec[tag=like]
|===
include::{esql-specs}/docs.csv-spec[tag=like-result]
|===

Matching the exact characters `*` and `.` will require escaping.
The escape character is backslash `\`. Since also backslash is a special character in string literals,
it will require further escaping.

[source.merge.styled,esql]
----
include::{esql-specs}/string.csv-spec[tag=likeEscapingSingleQuotes]
----

To reduce the overhead of escaping, we suggest using triple quotes strings `"""`

[source.merge.styled,esql]
----
include::{esql-specs}/string.csv-spec[tag=likeEscapingTripleQuotes]
----
// end::body[]
16 changes: 16 additions & 0 deletions docs/reference/esql/functions/rlike.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,20 @@ include::{esql-specs}/docs.csv-spec[tag=rlike]
|===
include::{esql-specs}/docs.csv-spec[tag=rlike-result]
|===

Matching special characters (eg. `.`, `*`, `(`...) will require escaping.
The escape character is backslash `\`. Since also backslash is a special character in string literals,
it will require further escaping.

[source.merge.styled,esql]
----
include::{esql-specs}/string.csv-spec[tag=rlikeEscapingSingleQuotes]
----

To reduce the overhead of escaping, we suggest using triple quotes strings `"""`

[source.merge.styled,esql]
----
include::{esql-specs}/string.csv-spec[tag=rlikeEscapingTripleQuotes]
----
// end::body[]
62 changes: 40 additions & 22 deletions docs/reference/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,45 @@ include::links.asciidoc[]

include::landing-page.asciidoc[]

include::release-notes/highlights.asciidoc[]
// overview / install

include::intro.asciidoc[]

include::quickstart/index.asciidoc[]

include::setup.asciidoc[]

include::upgrade.asciidoc[]
// search solution

include::index-modules.asciidoc[]
include::search/search-your-data/search-your-data.asciidoc[]

include::mapping.asciidoc[]
include::reranking/index.asciidoc[]

include::analysis.asciidoc[]
// data management

include::index-modules.asciidoc[]

include::indices/index-templates.asciidoc[]

include::data-streams/data-streams.asciidoc[]
include::alias.asciidoc[]

include::ingest.asciidoc[]
include::mapping.asciidoc[]

include::alias.asciidoc[]
include::analysis.asciidoc[]

include::search/search-your-data/search-your-data.asciidoc[]
include::ingest.asciidoc[]

include::reranking/index.asciidoc[]
include::connector/docs/index.asciidoc[]

include::query-dsl.asciidoc[]
include::data-streams/data-streams.asciidoc[]

include::aggregations.asciidoc[]
include::data-management.asciidoc[]

include::geospatial-analysis.asciidoc[]
include::data-rollup-transform.asciidoc[]

include::connector/docs/index.asciidoc[]
// analysis tools

include::query-dsl.asciidoc[]

include::eql/eql.asciidoc[]

Expand All @@ -50,34 +54,48 @@ include::sql/index.asciidoc[]

include::scripting.asciidoc[]

include::data-management.asciidoc[]
include::aggregations.asciidoc[]

include::autoscaling/index.asciidoc[]
include::geospatial-analysis.asciidoc[]

include::watcher/index.asciidoc[]

// cluster management

include::monitoring/index.asciidoc[]

include::data-rollup-transform.asciidoc[]
include::security/index.asciidoc[]

// production tasks

include::high-availability.asciidoc[]

include::how-to.asciidoc[]

include::autoscaling/index.asciidoc[]

include::snapshot-restore/index.asciidoc[]

include::security/index.asciidoc[]
// reference

include::watcher/index.asciidoc[]
include::rest-api/index.asciidoc[]

include::commands/index.asciidoc[]

include::how-to.asciidoc[]

include::troubleshooting.asciidoc[]

include::rest-api/index.asciidoc[]
// upgrades

include::upgrade.asciidoc[]

include::migration/index.asciidoc[]

include::release-notes/highlights.asciidoc[]

include::release-notes.asciidoc[]

include::dependencies-versions.asciidoc[]

// etc

include::redirects.asciidoc[]
Loading

0 comments on commit d1e9ce0

Please sign in to comment.