Skip to content

Commit

Permalink
Merge branch 'elastic:main' into chunking_settings
Browse files Browse the repository at this point in the history
  • Loading branch information
dan-rubinstein authored Sep 10, 2024
2 parents f3937f5 + f6ace50 commit 2947b82
Show file tree
Hide file tree
Showing 542 changed files with 7,828 additions and 2,435 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipelines/intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["7.17.24", "8.15.2", "8.16.0"]
BWC_VERSION: ["7.17.25", "8.15.2", "8.16.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/pipelines/periodic-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ steps:
env:
BWC_VERSION: 7.16.3

- label: "{{matrix.image}} / 7.17.24 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.24
- label: "{{matrix.image}} / 7.17.25 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.25
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -337,7 +337,7 @@ steps:
buildDirectory: /dev/shm/bk
diskSizeGb: 250
env:
BWC_VERSION: 7.17.24
BWC_VERSION: 7.17.25

- label: "{{matrix.image}} / 8.0.1 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.1
Expand Down
10 changes: 5 additions & 5 deletions .buildkite/pipelines/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 7.17.24 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.24#bwcTest
- label: 7.17.25 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.25#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -353,7 +353,7 @@ steps:
preemptible: true
diskSizeGb: 250
env:
BWC_VERSION: 7.17.24
BWC_VERSION: 7.17.25
retry:
automatic:
- exit_status: "-1"
Expand Down Expand Up @@ -771,7 +771,7 @@ steps:
setup:
ES_RUNTIME_JAVA:
- openjdk17
BWC_VERSION: ["7.17.24", "8.15.2", "8.16.0"]
BWC_VERSION: ["7.17.25", "8.15.2", "8.16.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down Expand Up @@ -821,7 +821,7 @@ steps:
- openjdk21
- openjdk22
- openjdk23
BWC_VERSION: ["7.17.24", "8.15.2", "8.16.0"]
BWC_VERSION: ["7.17.25", "8.15.2", "8.16.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
2 changes: 1 addition & 1 deletion .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ BWC_VERSION:
- "7.14.2"
- "7.15.2"
- "7.16.3"
- "7.17.24"
- "7.17.25"
- "8.0.1"
- "8.1.3"
- "8.2.3"
Expand Down
7 changes: 7 additions & 0 deletions .ci/scripts/resolve-dra-manifest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@ LATEST_VERSION=$(strip_version $LATEST_BUILD)
if [ "$LATEST_VERSION" != "$ES_VERSION" ]; then
echo "Latest build for '$ARTIFACT' is version $LATEST_VERSION but expected version $ES_VERSION." 1>&2
NEW_BRANCH=$(echo $ES_VERSION | sed -E "s/([0-9]+\.[0-9]+)\.[0-9]/\1/g")

# Temporary
if [[ "$ES_VERSION" == "8.16.0" ]]; then
NEW_BRANCH="8.x"
fi

echo "Using branch $NEW_BRANCH instead of $BRANCH." 1>&2
echo "https://artifacts-$WORKFLOW.elastic.co/$ARTIFACT/latest/$NEW_BRANCH.json"
LATEST_BUILD=$(fetch_build $WORKFLOW $ARTIFACT $NEW_BRANCH)
fi

Expand Down
2 changes: 1 addition & 1 deletion .ci/snapshotBwcVersions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BWC_VERSION:
- "7.17.24"
- "7.17.25"
- "8.15.2"
- "8.16.0"
6 changes: 6 additions & 0 deletions docs/changelog/109193.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 109193
summary: "[ES|QL] explicit cast a string literal to `date_period` and `time_duration`\
\ in arithmetic operations"
area: ES|QL
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/111981.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 111981
summary: Allow fields with dots in sparse vector field mapper
area: Mapping
type: enhancement
issues:
- 109118
6 changes: 6 additions & 0 deletions docs/changelog/112401.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 112401
summary: "ESQL: Fix CASE when conditions are multivalued"
area: ES|QL
type: bug
issues:
- 112359
5 changes: 5 additions & 0 deletions docs/changelog/112574.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 112574
summary: Add privileges required for CDR misconfiguration features to work on AWS SecurityHub integration
area: Authorization
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/112649.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 112649
summary: Allowlist `tracestate` header on remote server port
area: Security
type: bug
issues: []
173 changes: 171 additions & 2 deletions docs/reference/cluster/stats.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1307,6 +1307,142 @@ Each repository type may also include other statistics about the repositories of
====

`ccs`::
(object) Contains information relating to <<modules-cross-cluster-search, {ccs}>> settings and activity in the cluster.
+
.Properties of `ccs`
[%collapsible%open]
=====
`_search`:::
(object) Contains the telemetry information about the <<modules-cross-cluster-search, {ccs}>> usage in the cluster.
+
.Properties of `_search`
[%collapsible%open]
======
`total`:::
(integer) The total number of {ccs} requests that have been executed by the cluster.

`success`:::
(integer) The total number of {ccs} requests that have been successfully executed by the cluster.

`skipped`:::
(integer) The total number of {ccs} requests (successful or failed) that had at least one remote cluster skipped.

`took`:::
(object) Contains statistics about the time taken to execute {ccs} requests.
+
.Properties of `took`
[%collapsible%open]
=======
`max`:::
(integer) The maximum time taken to execute a {ccs} request, in milliseconds.
`avg`:::
(integer) The median time taken to execute a {ccs} request, in milliseconds.
`p90`:::
(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
=======

`took_mrt_true`::
(object) Contains statistics about the time taken to execute {ccs} requests for which the
<<ccs-minimize-roundtrips,`ccs_minimize_roundtrips`>> setting was set to `true`.
+
.Properties of `took_mrt_true`
[%collapsible%open]
=======
`max`:::
(integer) The maximum time taken to execute a {ccs} request, in milliseconds.
`avg`:::
(integer) The median time taken to execute a {ccs} request, in milliseconds.
`p90`:::
(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
=======

`took_mrt_false`::
(object) Contains statistics about the time taken to execute {ccs} requests for which the
<<ccs-minimize-roundtrips,`ccs_minimize_roundtrips`>> setting was set to `false`.
+
.Properties of `took_mrt_false`
[%collapsible%open]
=======
`max`:::
(integer) The maximum time taken to execute a {ccs} request, in milliseconds.
`avg`:::
(integer) The median time taken to execute a {ccs} request, in milliseconds.
`p90`:::
(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
=======

`remotes_per_search_max`::
(integer) The maximum number of remote clusters that were queried in a single {ccs} request.

`remotes_per_search_avg`::
(float) The average number of remote clusters that were queried in a single {ccs} request.

`failure_reasons`::
(object) Contains statistics about the reasons for {ccs} request failures.
The keys are the failure reason names and the values are the number of requests that failed for that reason.

`features`::
(object) Contains statistics about the features used in {ccs} requests. The keys are the names of the search feature,
and the values are the number of requests that used that feature. Single request can use more than one feature
(e.g. both `async` and `wildcard`). Known features are:

* `async` - <<async-search, Async search>>

* `mrt` - <<ccs-minimize-roundtrips,`ccs_minimize_roundtrips`>> setting was set to `true`.

* `wildcard` - <<api-multi-index,Multi-target syntax>> for indices with wildcards was used in the search request.

`clients`::
(object) Contains statistics about the clients that executed {ccs} requests.
The keys are the names of the clients, and the values are the number of requests that were executed by that client.
Only known clients (such as `kibana` or `elasticsearch`) are counted.

`clusters`::
(object) Contains statistics about the clusters that were queried in {ccs} requests.
The keys are cluster names, and the values are per-cluster telemetry data.
This also includes the local cluster itself, which uses the name `(local)`.
+
.Properties of per-cluster data:
[%collapsible%open]
=======
`total`:::
(integer) The total number of successful (not skipped) {ccs} requests that were executed against this cluster.
This may include requests where partial results were returned, but not requests in which the cluster has been skipped entirely.
`skipped`:::
(integer) The total number of {ccs} requests for which this cluster was skipped.
`took`:::
(object) Contains statistics about the time taken to execute requests against this cluster.
+
.Properties of `took`
[%collapsible%open]
========
`max`:::
(integer) The maximum time taken to execute a {ccs} request, in milliseconds.

`avg`:::
(integer) The median time taken to execute a {ccs} request, in milliseconds.

`p90`:::
(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
========
=======

======
=====

[[cluster-stats-api-example]]
==== {api-examples-title}

Expand Down Expand Up @@ -1607,7 +1743,35 @@ The API returns the following response:
},
"repositories": {
...
}
},
"ccs": {
"_search": {
"total": 7,
"success": 7,
"skipped": 0,
"took": {
"max": 36,
"avg": 20,
"p90": 33
},
"took_mrt_true": {
"max": 33,
"avg": 15,
"p90": 33
},
"took_mrt_false": {
"max": 36,
"avg": 26,
"p90": 36
},
"remotes_per_search_max": 3,
"remotes_per_search_avg": 2.0,
"failure_reasons": { ... },
"features": { ... },
"clients": { ... },
"clusters": { ... }
}
}
}
--------------------------------------------------
// TESTRESPONSE[s/"plugins": \[[^\]]*\]/"plugins": $body.$_path/]
Expand All @@ -1618,10 +1782,15 @@ The API returns the following response:
// TESTRESPONSE[s/"packaging_types": \[[^\]]*\]/"packaging_types": $body.$_path/]
// TESTRESPONSE[s/"snapshots": \{[^\}]*\}/"snapshots": $body.$_path/]
// TESTRESPONSE[s/"repositories": \{[^\}]*\}/"repositories": $body.$_path/]
// TESTRESPONSE[s/"clusters": \{[^\}]*\}/"clusters": $body.$_path/]
// TESTRESPONSE[s/"features": \{[^\}]*\}/"features": $body.$_path/]
// TESTRESPONSE[s/"clients": \{[^\}]*\}/"clients": $body.$_path/]
// TESTRESPONSE[s/"failure_reasons": \{[^\}]*\}/"failure_reasons": $body.$_path/]
// TESTRESPONSE[s/"field_types": \[[^\]]*\]/"field_types": $body.$_path/]
// TESTRESPONSE[s/"runtime_field_types": \[[^\]]*\]/"runtime_field_types": $body.$_path/]
// TESTRESPONSE[s/"search": \{[^\}]*\}/"search": $body.$_path/]
// TESTRESPONSE[s/: true|false/: $body.$_path/]
// TESTRESPONSE[s/"remotes_per_search_avg": [.0-9]+/"remotes_per_search_avg": $body.$_path/]
// TESTRESPONSE[s/: (true|false)/: $body.$_path/]
// TESTRESPONSE[s/: (\-)?[0-9]+/: $body.$_path/]
// TESTRESPONSE[s/: "[^"]*"/: $body.$_path/]
// These replacements do a few things:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions docs/reference/esql/functions/examples/to_dateperiod.asciidoc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions docs/reference/esql/functions/examples/to_timeduration.asciidoc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2947b82

Please sign in to comment.