Skip to content

Commit 253eed9

Browse files
jdconradjdconrad
authored
Merge branch 'main' into removedocid
2 parents 0fa3956 + 67b15ad commit 253eed9

File tree

409 files changed

+5647
-3698
lines changed

Some content is hidden

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

409 files changed

+5647
-3698
lines changed

‎docs/changelog/126385.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 126385
2+
summary: Filter out empty top docs results before merging
3+
area: Search
4+
type: bug
5+
issues:
6+
- 126118

‎docs/redirects.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
redirects:
2+
'reference/query-languages/esql/esql-functions-operators.md': '!reference/query-languages/esql/functions-operators/aggregation-functions.md'
3+
'reference/query-languages/esql/esql-commands.md': '!reference/query-languages/esql/commands/processing-commands.md'

‎docs/reference/query-languages/esql/_snippets/aggregation-functions.md‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎docs/reference/query-languages/esql/_snippets/commands/examples/date.csv-spec/docsNowWhere.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
```esql
4+
FROM sample_data
5+
| WHERE @timestamp > NOW() - 1 hour
6+
```

‎docs/reference/query-languages/esql/_snippets/commands/examples/docs.csv-spec/basicDissect.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
```esql
4+
ROW a = "2023-01-23T12:15:00.000Z - some text - 127.0.0.1"
5+
| DISSECT a """%{date} - %{msg} - %{ip}"""
6+
| KEEP date, msg, ip
7+
```
8+
9+
| date:keyword | msg:keyword | ip:keyword |
10+
| --- | --- | --- |
11+
| 2023-01-23T12:15:00.000Z | some text | 127.0.0.1 |

‎docs/reference/query-languages/esql/_snippets/commands/examples/docs.csv-spec/basicGrok.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
```esql
4+
ROW a = "2023-01-23T12:15:00.000Z 127.0.0.1 [email protected] 42"
5+
| GROK a """%{TIMESTAMP_ISO8601:date} %{IP:ip} %{EMAILADDRESS:email} %{NUMBER:num}"""
6+
| KEEP date, ip, email, num
7+
```
8+
9+
| date:keyword | ip:keyword | email:keyword | num:keyword |
10+
| --- | --- | --- | --- |
11+
| 2023-01-23T12:15:00.000Z | 127.0.0.1 | [email protected] | 42 |

‎docs/reference/query-languages/esql/_snippets/commands/examples/docs.csv-spec/dissectWithToDatetime.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
```esql
4+
ROW a = "2023-01-23T12:15:00.000Z - some text - 127.0.0.1"
5+
| DISSECT a """%{date} - %{msg} - %{ip}"""
6+
| KEEP date, msg, ip
7+
| EVAL date = TO_DATETIME(date)
8+
```
9+
10+
| msg:keyword | ip:keyword | date:date |
11+
| --- | --- | --- |
12+
| some text | 127.0.0.1 | 2023-01-23T12:15:00.000Z |

‎docs/reference/query-languages/esql/_snippets/commands/examples/docs.csv-spec/grokWithConversionSuffix.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
```esql
4+
ROW a = "2023-01-23T12:15:00.000Z 127.0.0.1 [email protected] 42"
5+
| GROK a """%{TIMESTAMP_ISO8601:date} %{IP:ip} %{EMAILADDRESS:email} %{NUMBER:num:int}"""
6+
| KEEP date, ip, email, num
7+
```
8+
9+
| date:keyword | ip:keyword | email:keyword | num:integer |
10+
| --- | --- | --- | --- |
11+
| 2023-01-23T12:15:00.000Z | 127.0.0.1 | [email protected] | 42 |

‎docs/reference/query-languages/esql/_snippets/commands/examples/docs.csv-spec/grokWithDuplicateFieldNames.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
```esql
4+
FROM addresses
5+
| KEEP city.name, zip_code
6+
| GROK zip_code """%{WORD:zip_parts} %{WORD:zip_parts}"""
7+
```
8+
9+
| city.name:keyword | zip_code:keyword | zip_parts:keyword |
10+
| --- | --- | --- |
11+
| Amsterdam | 1016 ED | ["1016", "ED"] |
12+
| San Francisco | CA 94108 | ["CA", "94108"] |
13+
| Tokyo | 100-7014 | null |

‎docs/reference/query-languages/esql/_snippets/commands/examples/docs.csv-spec/grokWithToDatetime.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
```esql
4+
ROW a = "2023-01-23T12:15:00.000Z 127.0.0.1 [email protected] 42"
5+
| GROK a """%{TIMESTAMP_ISO8601:date} %{IP:ip} %{EMAILADDRESS:email} %{NUMBER:num:int}"""
6+
| KEEP date, ip, email, num
7+
| EVAL date = TO_DATETIME(date)
8+
```
9+
10+
| ip:keyword | email:keyword | num:integer | date:date |
11+
| --- | --- | --- | --- |
12+
| 127.0.0.1 | [email protected] | 42 | 2023-01-23T12:15:00.000Z |

0 commit comments

Comments
 (0)