Skip to content

Commit 7957b83

Browse files
committed
Merge remote-tracking branch 'origin/main' into tsdb-hash-once
2 parents 556a00e + dcdbbe0 commit 7957b83

File tree

85 files changed

+2244
-296
lines changed

Some content is hidden

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

85 files changed

+2244
-296
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ x-pack/plugin/apm-data/src/yamlRestTest/resources @elastic/obs-ds-intake-service
3434
x-pack/plugin/otel-data/src/main/resources @elastic/obs-ds-intake-services
3535
x-pack/plugin/otel-data/src/yamlRestTest/resources @elastic/obs-ds-intake-services
3636

37+
# Storage Engine
38+
x-pack/plugin/otel-data/src/main/java/org/elasticsearch/xpack/oteldata/otlp @elastic/es-storage-engine
39+
x-pack/plugin/otel-data/src/test/java/org/elasticsearch/xpack/oteldata/otlp @elastic/es-storage-engine
40+
x-pack/plugin/otel-data/src/javaRestTest/java/org/elasticsearch/xpack/oteldata/otlp @elastic/es-storage-engine
41+
3742
# Delivery
3843
gradle @elastic/es-delivery
3944
build-conventions @elastic/es-delivery

benchmarks/src/main/java/org/elasticsearch/benchmark/exponentialhistogram/ExponentialHistogramMergeBench.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private ExponentialHistogram asCompressedHistogram(ExponentialHistogram histogra
130130
CompressedExponentialHistogram.writeHistogramBytes(histoBytes, histogram.scale(), negativeBuckets, positiveBuckets);
131131
CompressedExponentialHistogram result = new CompressedExponentialHistogram();
132132
BytesRef data = histoBytes.bytes().toBytesRef();
133-
result.reset(histogram.zeroBucket().zeroThreshold(), totalCount, histogram.sum(), histogram.min(), data);
133+
result.reset(histogram.zeroBucket().zeroThreshold(), totalCount, histogram.sum(), histogram.min(), histogram.max(), data);
134134
return result;
135135
} catch (IOException e) {
136136
throw new RuntimeException(e);

branches.json

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
{
2-
"notice": "This file is not maintained outside of the main branch and should only be used for tooling.",
3-
"branches": [
2+
"notice" : "This file is not maintained outside of the main branch and should only be used for tooling.",
3+
"branches" : [
44
{
5-
"branch": "main"
5+
"branch" : "main",
6+
"version" : "9.2.0"
67
},
78
{
8-
"branch": "9.1"
9+
"branch" : "9.1",
10+
"version" : "9.1.4"
911
},
1012
{
11-
"branch": "9.0"
13+
"branch" : "9.0",
14+
"version" : "9.0.7"
1215
},
1316
{
14-
"branch": "8.19"
17+
"branch" : "8.19",
18+
"version" : "8.19.4"
1519
},
1620
{
17-
"branch": "8.18"
21+
"branch" : "8.18",
22+
"version" : "8.18.7"
1823
},
1924
{
20-
"branch": "7.17"
25+
"branch" : "7.17",
26+
"version" : "7.17.30"
2127
}
2228
]
2329
}

docs/changelog/133952.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 133952
2+
summary: Fix warning when creating an OTel data stream
3+
area: TSDB
4+
type: bug
5+
issues:
6+
- 132918

docs/reference/elasticsearch/elasticsearch-audit-events.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Certain audit events require the `security_config_change` event type to log the
3131
$$$event-access-denied$$$
3232

3333
`access_denied`
34-
: Logged when an authenticated user attempts to execute an action they do not have the necessary [privilege](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md) to perform.
34+
: Logged when an authenticated user attempts to execute an action they do not have the necessary [privilege](/reference/elasticsearch/security-privileges.md) to perform.
3535

3636
::::{dropdown} Example
3737
```js
@@ -510,7 +510,7 @@ $$$event-realm-auth-failed$$$
510510
$$$event-runas-denied$$$
511511

512512
`run_as_denied`
513-
: Logged when an authenticated user attempts to [run as](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md) another user that they do not have the necessary [privileges](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md) to do so.
513+
: Logged when an authenticated user attempts to [run as](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md) another user that they do not have the necessary [privileges](/reference/elasticsearch/security-privileges.md) to do so.
514514

515515
::::{dropdown} Example
516516
```js

docs/reference/elasticsearch/mapping-reference/dense-vector.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ The following mapping parameters are accepted:
274274
$$$dense-vector-element-type$$$
275275

276276
`element_type`
277-
: (Optional, string) The data type used to encode vectors. The supported data types are `float` (default), `byte`, and bit.
277+
: (Optional, string) The data type used to encode vectors. The supported data types are `float` (default), `byte`, and `bit`.
278278

279279
::::{dropdown} Valid values for element_type
280280
`float`

docs/reference/elasticsearch/mapping-reference/rank-vectors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ The `rank_vectors` field type supports the following parameters:
9090
$$$rank-vectors-element-type$$$
9191

9292
`element_type`
93-
: (Optional, string) The data type used to encode vectors. The supported data types are `float` (default), `byte`, and bit.
93+
: (Optional, string) The data type used to encode vectors. The supported data types are `float` (default), `byte`, and `bit`.
9494

9595
::::{dropdown} Valid values for element_type
9696
`float`

docs/reference/elasticsearch/rest-apis/create-index-from-source.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ For the most up-to-date API details, refer to [Index APIs](https://www.elastic.c
2626

2727
## {{api-prereq-title}} [indices-create-index-from-source-api-prereqs]
2828

29-
* If the {{es}} {{security-features}} are enabled, you must have the `manage` [index privilege](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md#privileges-list-indices) for the index.
29+
* If the {{es}} {{security-features}} are enabled, you must have the `manage` [index privilege](/reference/elasticsearch/security-privileges.md#privileges-list-indices) for the index.
3030

3131

3232
## {{api-description-title}} [indices-create-index-from-source-api-desc]

docs/reference/elasticsearch/rest-apis/reindex-data-stream.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This api runs in the background because reindexing all indices in a large data s
3333

3434
## {{api-prereq-title}} [data-stream-reindex-api-prereqs]
3535

36-
* If the {{es}} {{security-features}} are enabled, you must have the `manage` [index privilege](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md#privileges-list-indices) for the data stream.
36+
* If the {{es}} {{security-features}} are enabled, you must have the `manage` [index privilege](/reference/elasticsearch/security-privileges.md#privileges-list-indices) for the data stream.
3737

3838

3939
## {{api-request-body-title}} [data-stream-reindex-body]

docs/reference/search-connectors/release-notes.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ If you are an Enterprise Search user and want to upgrade to Elastic 9.0, refer t
1313
It includes detailed steps, tooling, and resources to help you transition to supported alternatives in 9.x, such as Elasticsearch, the Open Web Crawler, and self-managed connectors.
1414
:::
1515

16+
## 9.1.3 [connectors-9.1.3-release-notes]
17+
There are no new features, enhancements, fixes, known issues, or deprecations associated with this release.
18+
1619
## 9.1.2 [connectors-9.1.2-release-notes]
1720
There are no new features, enhancements, fixes, known issues, or deprecations associated with this release.
1821

@@ -29,6 +32,9 @@ Permissions granted to the `Everyone Except External Users` group were previousl
2932
## 9.1.0 [connectors-9.1.0-release-notes]
3033
There are no new features, enhancements, fixes, known issues, or deprecations associated with this release.
3134

35+
## 9.0.6 [connectors-9.0.6-release-notes]
36+
No changes since 9.0.5
37+
3238
## 9.0.5 [connectors-9.0.5-release-notes]
3339

3440
### Fixes [connectors-9.0.5-fixes]

0 commit comments

Comments
 (0)