Skip to content

Commit e327289

Browse files
Merge branch 'main' into remove-snapshot-failures
2 parents 0761fc4 + e0a4584 commit e327289

File tree

128 files changed

+2335
-2009
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+2335
-2009
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchBuildCompletePlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
1616
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
1717
import org.apache.commons.io.IOUtils;
18+
import org.elasticsearch.gradle.OS;
1819
import org.elasticsearch.gradle.util.GradleUtils;
1920
import org.gradle.api.Plugin;
2021
import org.gradle.api.Project;
@@ -61,7 +62,7 @@ public void apply(Project target) {
6162
? System.getenv("BUILD_NUMBER")
6263
: System.getenv("BUILDKITE_BUILD_NUMBER");
6364
String performanceTest = System.getenv("BUILD_PERFORMANCE_TEST");
64-
if (buildNumber != null && performanceTest == null && GradleUtils.isIncludedBuild(target) == false) {
65+
if (buildNumber != null && performanceTest == null && GradleUtils.isIncludedBuild(target) == false && OS.current() != OS.WINDOWS) {
6566
File targetFile = calculateTargetFile(target, buildNumber);
6667
File projectDir = target.getProjectDir();
6768
File gradleWorkersDir = new File(target.getGradle().getGradleUserHomeDir(), "workers/");

docs/changelog/114566.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114566
2+
summary: Use Azure blob batch API to delete blobs in batches
3+
area: Distributed
4+
type: enhancement
5+
issues: []

docs/changelog/115061.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 115061
2+
summary: "[ES|QL] Simplify syntax of named parameter for identifier and pattern"
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/115241.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 115241
2+
summary: "[Security Solution] Add `create_index` to `kibana_system` role for index/DS\
3+
\ `.logs-endpoint.action.responses-*`"
4+
area: Authorization
5+
type: enhancement
6+
issues: []

docs/changelog/115312.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 115312
2+
summary: "ESQL: Fix filtered grouping on ords"
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 114897

docs/changelog/115383.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 115383
2+
summary: Only publish desired balance gauges on master
3+
area: Allocation
4+
type: enhancement
5+
issues: []

docs/changelog/115404.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 115404
2+
summary: Fix NPE in Get Deployment Stats
3+
area: Machine Learning
4+
type: bug
5+
issues: []

docs/changelog/115414.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
pr: 115414
2+
summary: Mitigate IOSession timeouts
3+
area: Machine Learning
4+
type: bug
5+
issues:
6+
- 114385
7+
- 114327
8+
- 114105
9+
- 114232

docs/reference/cat/trainedmodel.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=cat-v]
116116

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

docs/reference/esql/esql-process-data-with-dissect-grok.asciidoc

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ delimiter-based pattern, and extracts the specified keys as columns.
4040
For example, the following pattern:
4141
[source,txt]
4242
----
43-
%{clientip} [%{@timestamp}] %{status}
43+
%{clientip} [%{@timestamp}] %{status}
4444
----
4545

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

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

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

9797
Examples:
9898

99-
* `%{?aaa}` - the key is `aaa`
100-
* `%{+bbb/3}` - the key is `bbb`
101-
* `%{&ccc}` - the key is `ccc`
99+
* `%{?aaa}` - the key is `aaa`
100+
* `%{+bbb/3}` - the key is `bbb`
101+
* `%{&ccc}` - the key is `ccc`
102102
--
103103

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

219219
[source.merge.styled,esql]
220220
----
221-
include::{esql-specs}/docs.csv-spec[tag=grokWithEscape]
221+
include::{esql-specs}/docs.csv-spec[tag=grokWithEscapeTripleQuotes]
222222
----
223223

224224
`GROK` adds the following columns to the input table:
@@ -239,15 +239,24 @@ with a `\`. For example, in the earlier pattern:
239239
%{IP:ip} \[%{TIMESTAMP_ISO8601:@timestamp}\] %{GREEDYDATA:status}
240240
----
241241
242-
In {esql} queries, the backslash character itself is a special character that
242+
In {esql} queries, when using single quotes for strings, the backslash character itself is a special character that
243243
needs to be escaped with another `\`. For this example, the corresponding {esql}
244244
query becomes:
245245
[source.merge.styled,esql]
246246
----
247247
include::{esql-specs}/docs.csv-spec[tag=grokWithEscape]
248248
----
249+
250+
For this reason, in general it is more convenient to use triple quotes `"""` for GROK patterns,
251+
that do not require escaping for backslash.
252+
253+
[source.merge.styled,esql]
254+
----
255+
include::{esql-specs}/docs.csv-spec[tag=grokWithEscapeTripleQuotes]
256+
----
249257
====
250258

259+
251260
[[esql-grok-patterns]]
252261
===== Grok patterns
253262

@@ -318,4 +327,4 @@ as the `GROK` command.
318327
The `GROK` command does not support configuring <<custom-patterns,custom
319328
patterns>>, or <<trace-match,multiple patterns>>. The `GROK` command is not
320329
subject to <<grok-watchdog,Grok watchdog settings>>.
321-
// end::grok-limitations[]
330+
// end::grok-limitations[]

0 commit comments

Comments
 (0)