Skip to content

Commit

Permalink
Merge branch 'main' into internal-rest-test-write-to-keystore-file
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Dec 11, 2023
2 parents d2355eb + ce9e919 commit 0187001
Show file tree
Hide file tree
Showing 106 changed files with 1,914 additions and 821 deletions.
2 changes: 1 addition & 1 deletion build-tools-internal/version.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
elasticsearch = 8.13.0
lucene = 9.9.0
lucene = 9.9.0-snapshot-bb4fec631e6

bundled_jdk_vendor = openjdk
bundled_jdk = 21.0.1+12@415e3f918a1f4062a0074a2794853d0d
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog/103003.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 103003
summary: "Fix: Watcher REST API `GET /_watcher/settings` now includes product header"
area: "Watcher"
type: bug
issues:
- 102928
5 changes: 5 additions & 0 deletions docs/changelog/103025.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 103025
summary: "Metrics: Allow `AsyncCounters` to switch providers"
area: Infra/Core
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/103091.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 103091
summary: "Metrics: Handle null observations in observers"
area: Infra/Core
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/103130.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 103130
summary: Create a DSL health indicator as part of the health API
area: Health
type: feature
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/103151.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 103151
summary: Wrap painless explain error
area: Infra/Scripting
type: bug
issues:
- 103018
5 changes: 5 additions & 0 deletions docs/changelog/103185.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 103185
summary: Fix format string in `OldLuceneVersions`
area: Search
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/103203.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 103203
summary: Fix NPE & empty result handling in `CountOnlyQueryPhaseResultConsumer`
area: Search
type: bug
issues: []
36 changes: 36 additions & 0 deletions docs/reference/data-streams/lifecycle/apis/put-lifecycle.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ duration the document could be deleted. When empty, every document in this data
If defined, it turns data streqm lifecycle on/off (`true`/`false`) for this data stream.
A data stream lifecycle that's disabled (`enabled: false`) will have no effect on the
data stream. Defaults to `true`.
`downsampling`::
(Optional, array)
An optional array of downsampling configuration objects, each defining an `after`
interval representing when the backing index is meant to be downsampled (the time
frame is calculated since the index was rolled over, i.e. generation time) and
a `fixed_interval` representing the downsampling interval (the minimum `fixed_interval`
value is `5m`). A maximum number of 10 downsampling rounds can be configured.
See <<data-streams-put-lifecycle-downsampling-example, configuration example>> below.
====

[[data-streams-put-lifecycle-example]]
Expand All @@ -84,3 +94,29 @@ When the lifecycle is successfully updated in all data streams, you receive the
"acknowledged": true
}
--------------------------------------------------

[[data-streams-put-lifecycle-downsampling-example]]
==== {api-examples-title}

The following example configures two downsampling rounds, the first one starting
one day after the backing index is rolled over (or later, if the index is still
within its write-accepting <<time-bound-indices, time bounds>>) with an interval
of `10m`, and a second round starting 7 days after rollover at an interval of `1d`:

[source,console]
--------------------------------------------------------------------
PUT _data_stream/my-weather-sensor-data-stream/_lifecycle
{
"downsampling": [
{
"after": "1d",
"fixed_interval": "10m"
},
{
"after": "7d",
"fixed_interval": "1d"
}
]
}
--------------------------------------------------------------------
//TEST[skip:downsampling requires waiting for indices to be out of time bounds]
8 changes: 7 additions & 1 deletion docs/reference/data-streams/lifecycle/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ and backwards incompatible mapping changes.
* Configurable retention, which allows you to configure the time period for which your data is guaranteed to be stored.
{es} is allowed at a later time to delete data older than this time period.

A data stream lifecycle also supports downsampling the data stream backing indices.
See <<data-streams-put-lifecycle-downsampling-example, the downsampling example>> for
more details.

[discrete]
[[data-streams-lifecycle-how-it-works]]
=== How does it work?
Expand All @@ -35,7 +39,9 @@ into tiers of exponential sizes, merging the long tail of small segments is only
fraction of the cost of force mergeing to a single segment. The small segments would usually
hold the most recent data so tail mergeing will focus the merging resources on the higher-value
data that is most likely to keep being queried.
4. Applies retention to the remaining backing indices. This means deleting the backing indices whose
4. If <<data-streams-put-lifecycle-downsampling-example, downsampling>> is configured it will execute
all the configured downsampling rounds.
5. Applies retention to the remaining backing indices. This means deleting the backing indices whose
`generation_time` is longer than the configured retention period. The `generation_time` is only applicable to rolled over backing
indices and it is either the time since the backing index got rolled over, or the time optionally configured in the
<<index-data-stream-lifecycle-origination-date,`index.lifecycle.origination_date`>> setting.
Expand Down
10 changes: 9 additions & 1 deletion docs/reference/esql/functions/binary.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,12 @@ These binary comparison operators are supported:
* less than: `<`
* less than or equal: `<=`
* larger than: `>`
* larger than or equal: `>=`
* larger than or equal: `>=`

And these mathematical operators are supported:

[.text-center]
image::esql/functions/signature/add.svg[Embedded,opts=inline]

[.text-center]
image::esql/functions/signature/sub.svg[Embedded,opts=inline]
2 changes: 1 addition & 1 deletion docs/reference/esql/functions/cos.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[.text-center]
image::esql/functions/signature/cos.svg[Embedded,opts=inline]

https://en.wikipedia.org/wiki/Sine_and_cosine[Cosine] trigonometric function.
https://en.wikipedia.org/wiki/Sine_and_cosine[Cosine] trigonometric function. Input expected in radians.

[source.merge.styled,esql]
----
Expand Down
2 changes: 2 additions & 0 deletions docs/reference/esql/functions/operators.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Boolean operators for comparing against one or multiple expressions.

// tag::op_list[]
* <<esql-binary-operators>>
* <<esql-unary-operators>>
* <<esql-logical-operators>>
* <<esql-predicates>>
* <<esql-cidr_match>>
Expand All @@ -23,6 +24,7 @@ Boolean operators for comparing against one or multiple expressions.
// end::op_list[]

include::binary.asciidoc[]
include::unary.asciidoc[]
include::logical.asciidoc[]
include::predicates.asciidoc[]
include::cidr_match.asciidoc[]
Expand Down
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/add.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/div.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/equals.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/greater_than.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/less_than.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/mod.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/mul.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/neg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/not_equals.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/sub.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/reference/esql/functions/sin.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[.text-center]
image::esql/functions/signature/sin.svg[Embedded,opts=inline]

https://en.wikipedia.org/wiki/Sine_and_cosine[Sine] trigonometric function.
https://en.wikipedia.org/wiki/Sine_and_cosine[Sine] trigonometric function. Input expected in radians.

[source.merge.styled,esql]
----
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/esql/functions/tan.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[.text-center]
image::esql/functions/signature/tan.svg[Embedded,opts=inline]

https://en.wikipedia.org/wiki/Sine_and_cosine[Tangent] trigonometric function.
https://en.wikipedia.org/wiki/Sine_and_cosine[Tangent] trigonometric function. Input expected in radians.

[source.merge.styled,esql]
----
Expand Down
8 changes: 8 additions & 0 deletions docs/reference/esql/functions/unary.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[discrete]
[[esql-unary-operators]]
=== Unary operators

These unary mathematical operators are supported:

[.text-center]
image::esql/functions/signature/neg.svg[Embedded,opts=inline]
7 changes: 7 additions & 0 deletions docs/reference/search/search.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,13 @@ By default, you cannot page through more than 10,000 hits using the `from` and

include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=ignore_throttled]

`include_named_queries_score`::
(Optional, Boolean) If `true`, includes the score contribution from any named queries.
This functionality reruns each named query on every hit in a search
response. Typically, this adds a small overhead to a request. However, using
computationally expensive named queries on a large number of hits may add
significant overhead. Defaults to `false`.

include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=index-ignore-unavailable]

include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=lenient]
Expand Down
4 changes: 3 additions & 1 deletion docs/reference/snapshot-restore/repository-s3.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ settings belong in the `elasticsearch.yml` file.
`https`. Defaults to `https`. When using HTTPS, this repository type validates the
repository's certificate chain using the JVM-wide truststore. Ensure that
the root certificate authority is in this truststore using the JVM's
`keytool` tool.
`keytool` tool. If you have a custom certificate authority for your S3 repository
and you use the {es} <<jvm-version,bundled JDK>>, then you will need to reinstall your
CA certificate every time you upgrade {es}.

`proxy.host`::

Expand Down
Loading

0 comments on commit 0187001

Please sign in to comment.