Skip to content

Commit 879d71f

Browse files
committed
Merge remote-tracking branch 'origin/main' into esql_date_range_data_type
2 parents ab1506e + 8889536 commit 879d71f

File tree

43 files changed

+1042
-329
lines changed

Some content is hidden

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

43 files changed

+1042
-329
lines changed

docs/changelog/136610.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 136610
2+
summary: Pushing down eval expression when it requires data access
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 133462

docs/changelog/136720.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 136720
2+
summary: Use Suppliers To Get Inference Results In Semantic Queries
3+
area: Vector Search
4+
type: bug
5+
issues:
6+
- 136621

docs/changelog/136759.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 136759
2+
summary: Avoid counting snapshot failures twice in SLM
3+
area: ILM+SLM
4+
type: bug
5+
issues: []

docs/changelog/136805.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 136805
2+
summary: Allow single fork branch
3+
area: ES|QL
4+
type: enhancement
5+
issues:
6+
- 135825

docs/reference/enrich-processor/normalize-for-stream.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ If the document is not OpenTelemetry-compliant, the processor normalizes it as f
4444
| `log.level` | `severity_text` |
4545

4646
The processor first looks for the nested form of the ECS field and if such does not exist, it looks for a top-level field with the dotted field name.
47-
* Other specific ECS fields that describe resources and have corresponding counterparts in the OpenTelemetry Semantic Conventions are moved to the `resource.attribtues` map. Fields that are considered resource attributes are such that conform to the following conditions:
47+
* Other specific ECS fields that describe resources and have corresponding counterparts in the OpenTelemetry Semantic Conventions are moved to the `resource.attributes` map. Fields that are considered resource attributes are such that conform to the following conditions:
4848
* They are ECS fields that have corresponding counterparts (either with
4949
the same name or with a different name) in OpenTelemetry Semantic Conventions.
5050
* The corresponding OpenTelemetry attribute is defined in
5151
[Semantic Conventions](https://github.com/open-telemetry/semantic-conventions/tree/main/model)
52-
within a group that is defined as `type: enitity`.
52+
within a group that is defined as `type: entity`.
5353
* All other fields, except for `@timestamp`, are moved to the `attributes` map.
5454
* All non-array entries of the `attributes` and `resource.attributes` maps are flattened. Flattening means that nested objects are merged into their parent object, and the keys are concatenated with a dot. See examples below.
5555

@@ -149,6 +149,7 @@ will be normalized into the following form:
149149
}
150150
]
151151
},
152+
"severity_text": "INFO",
152153
"body": {
153154
"text": "Hello, world!"
154155
},
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
applies_to:
3+
stack:
4+
serverless:
5+
navigation_title: "Use cases"
6+
---
7+
8+
# Use cases for {{esql}}
9+
10+
These pages detail how to use {{esql}} for search and cybersecurity use cases:
11+
12+
- [ES|QL for search](docs-content://solutions/search/esql-for-search.md): Learn how to use {{esql}} for lexical (keyword) search, relevance scoring, semantic and hybrid search, semantic reranking, and more.
13+
- [ES|QL for security](docs-content://solutions/security/esql-for-security.md): Learn how to use {{esql}} for threat hunting, timeline investigation, detection rules, and migrating Splunk queries.

docs/reference/query-languages/toc.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ toc:
8787
- file: esql.md
8888
children:
8989
- file: esql/esql-getting-started.md
90+
- file: esql/esql-use-cases.md
91+
children:
92+
- title: "ES|QL for search"
93+
crosslink: docs-content://solutions/search/esql-for-search.md
94+
- title: "ES|QL for cybersecurity"
95+
crosslink: docs-content://solutions/security/esql-for-security.md
9096
- file: esql/esql-rest.md
9197
- file: esql/esql-syntax-reference.md
9298
children:
@@ -155,6 +161,8 @@ toc:
155161
- file: esql/esql-examples.md
156162
children:
157163
- file: esql/esql-search-tutorial.md
164+
- title: "ES|QL for threat hunting"
165+
crosslink: docs-content://solutions/security/esql-for-security/esql-threat-hunting-tutorial.md
158166
- file: esql/esql-troubleshooting.md
159167
children:
160168
- file: esql/esql-query-log.md

server/src/main/java/org/elasticsearch/index/IndexSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ public boolean isES87TSDBCodecEnabled() {
671671
public static final boolean DOC_VALUES_SKIPPER = new FeatureFlag("doc_values_skipper").isEnabled();
672672
public static final Setting<Boolean> USE_DOC_VALUES_SKIPPER = Setting.boolSetting(
673673
"index.mapping.use_doc_values_skipper",
674-
false,
674+
true,
675675
Property.IndexScope,
676676
Property.Final
677677
);

server/src/main/java/org/elasticsearch/index/IndexVersions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ private static Version parseUnchecked(String version) {
191191
public static final IndexVersion UPGRADE_TO_LUCENE_10_3_1 = def(9_041_0_00, Version.LUCENE_10_3_1);
192192

193193
public static final IndexVersion REENABLED_TIMESTAMP_DOC_VALUES_SPARSE_INDEX = def(9_042_0_00, Version.LUCENE_10_3_1);
194+
public static final IndexVersion SKIPPERS_ENABLED_BY_DEFAULT = def(9_043_0_00, Version.LUCENE_10_3_1);
194195

195196
/*
196197
* STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ private DateFieldMapper(
11001100
* Determines whether the doc values skipper (sparse index) should be used for the {@code @timestamp} field.
11011101
* <p>
11021102
* The doc values skipper is enabled only if {@code index.mapping.use_doc_values_skipper} is set to {@code true},
1103-
* the index was created on or after {@link IndexVersions#REENABLED_TIMESTAMP_DOC_VALUES_SPARSE_INDEX}, and the
1103+
* the index was created on or after {@link IndexVersions#SKIPPERS_ENABLED_BY_DEFAULT}, and the
11041104
* field has doc values enabled. Additionally, the index mode must be {@link IndexMode#LOGSDB} or {@link IndexMode#TIME_SERIES}, and
11051105
* the index sorting configuration must include the {@code @timestamp} field.
11061106
*
@@ -1109,9 +1109,8 @@ private DateFieldMapper(
11091109
* @param fullFieldName The full name of the field being checked, expected to be {@code @timestamp}.
11101110
* @return {@code true} if the doc values skipper should be used, {@code false} otherwise.
11111111
*/
1112-
11131112
private static boolean shouldUseDocValuesSkipper(IndexSettings indexSettings, boolean hasDocValues, final String fullFieldName) {
1114-
return indexSettings.getIndexVersionCreated().onOrAfter(IndexVersions.REENABLED_TIMESTAMP_DOC_VALUES_SPARSE_INDEX)
1113+
return indexSettings.getIndexVersionCreated().onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)
11151114
&& indexSettings.useDocValuesSkipper()
11161115
&& hasDocValues
11171116
&& (IndexMode.LOGSDB.equals(indexSettings.getMode()) || IndexMode.TIME_SERIES.equals(indexSettings.getMode()))

0 commit comments

Comments
 (0)