Skip to content

Commit 4a1db88

Browse files
committed
Merge branch 'main' into tet
2 parents dbdc721 + 564b509 commit 4a1db88

File tree

125 files changed

+2358
-573
lines changed

Some content is hidden

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

125 files changed

+2358
-573
lines changed

docs/changelog/130847.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130847
2+
summary: "Pipelines: Add `created_date` and `modified_date`"
3+
area: Ingest Node
4+
type: enhancement
5+
issues: []

docs/changelog/131027.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 131027
2+
summary: Handle structured log messages
3+
area: Ingest Node
4+
type: feature
5+
issues:
6+
- 130333

docs/changelog/131658.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131658
2+
summary: Fix `aggregate_metric_double` sorting and `mv_expand` issues
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/131775.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131775
2+
summary: Replace "representable" type error messages
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/131990.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 131990
2+
summary: Prevent the trained model deployment memory estimation from double-counting
3+
allocations
4+
area: Machine Learning
5+
type: bug
6+
issues: []
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
applies_to:
33
stack: all
4-
navigation_title: API examples
4+
serverless:
5+
navigation_title: Guides and examples
56
---
6-
# Elasticsearch API examples
7+
# Elasticsearch API guides and examples
78

8-
This section provides examples for performing common tasks such as sorting, collapsing, and filtering search results by using Elasticsearch APIs.
9-
10-
For more examples, check the [Elasticsearch](https://www.elastic.co/docs/api/doc/elasticsearch) and [Elasticsearch Serverless](https://www.elastic.co/docs/api/doc/elasticsearch-serverless) API reference.
9+
This section provides guides and examples for using certain Elasticsearch APIs. These longer-form pages augment and complement the information provided in the [Elasticsearch](https://www.elastic.co/docs/api/doc/elasticsearch) and [Elasticsearch Serverless](https://www.elastic.co/docs/api/doc/elasticsearch-serverless) API reference.

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,3 +153,87 @@ will be normalized into the following form:
153153
"trace_id": "abcdef1234567890abcdef1234567890"
154154
}
155155
```
156+
## Structured `message` field
157+
158+
If the `message` field in the ingested document is structured as a JSON, the
159+
processor will determine whether it is in ECS format or not, based on the
160+
existence or absence of the `@timestamp` field. If the `@timestamp` field is
161+
present, the `message` field will be considered to be in ECS format, and its
162+
contents will be merged into the root of the document and then normalized as
163+
described above. The `@timestamp` from the `message` field will override the
164+
root `@timestamp` field in the resulting document.
165+
If the `@timestamp` field is absent, the `message` field will be moved to
166+
the `body.structured` field as is, without any further normalization.
167+
168+
For example, if the `message` field is an ECS-JSON, as follows:
169+
170+
```json
171+
{
172+
"@timestamp": "2023-10-01T12:00:00Z",
173+
"message": "{\"@timestamp\":\"2023-10-01T12:01:00Z\",\"log.level\":\"INFO\",\"service.name\":\"my-service\",\"message\":\"The actual log message\",\"http\":{\"method\":\"GET\",\"url\":{\"path\":\"/api/v1/resource\"}}}"
174+
175+
}
176+
```
177+
it will be normalized into the following form:
178+
179+
```json
180+
{
181+
"@timestamp": "2023-10-01T12:01:00Z",
182+
"severity_text": "INFO",
183+
"body": {
184+
"text": "The actual log message"
185+
},
186+
"resource": {
187+
"attributes": {
188+
"service.name": "my-service"
189+
}
190+
},
191+
"attributes": {
192+
"http.method": "GET",
193+
"http.url.path": "/api/v1/resource"
194+
}
195+
}
196+
```
197+
198+
However, if the `message` field is not recognized as ECS format, as follows:
199+
200+
```json
201+
{
202+
"@timestamp": "2023-10-01T12:00:00Z",
203+
"log": {
204+
"level": "INFO"
205+
},
206+
"service": {
207+
"name": "my-service"
208+
},
209+
"tags": ["user-action", "api-call"],
210+
"message": "{\"root_cause\":\"Network error\",\"http\":{\"method\":\"GET\",\"url\":{\"path\":\"/api/v1/resource\"}}}"
211+
}
212+
```
213+
it will be normalized into the following form:
214+
215+
```json
216+
{
217+
"@timestamp": "2023-10-01T12:00:00Z",
218+
"severity_text": "INFO",
219+
"resource": {
220+
"attributes": {
221+
"service.name": "my-service"
222+
}
223+
},
224+
"attributes": {
225+
"tags": ["user-action", "api-call"]
226+
},
227+
"body": {
228+
"structured": {
229+
"root_cause": "Network error",
230+
"http": {
231+
"method": "GET",
232+
"url": {
233+
"path": "/api/v1/resource"
234+
}
235+
}
236+
}
237+
}
238+
}
239+
```

docs/reference/query-languages/esql/_snippets/functions/examples/v_dot_product.md

Lines changed: 16 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/examples/v_l1_norm.md

Lines changed: 16 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/layout/categorize.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)