Skip to content

Commit 8a98b45

Browse files
Merge branch 'main' into svilen/127208
2 parents 96951c7 + 3264d9e commit 8a98b45

File tree

152 files changed

+5675
-1885
lines changed

Some content is hidden

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

152 files changed

+5675
-1885
lines changed

benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/ValuesSourceReaderBenchmark.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,6 @@ record ItrAndOrd(PrimitiveIterator.OfInt itr, int ord) {}
579579
pages.add(
580580
new Page(
581581
new DocVector(
582-
583582
ShardRefCounted.ALWAYS_REFERENCED,
584583
blockFactory.newConstantIntBlockWith(0, size).asVector(),
585584
leafs.build().asBlock().asVector(),

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
5959
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:deprecation:qa:early-deprecation-rest");
6060
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:deprecation:qa:rest");
6161
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:downsample:qa:with-security");
62-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:enrich:qa:rest");
63-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:enrich:qa:rest-with-advanced-security");
64-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:enrich:qa:rest-with-security");
6562
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search:qa:rest");
6663
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:ccs-rolling-upgrade");
6764
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:correctness");

docs/changelog/130279.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130279
2+
summary: Fix missing removal of query cancellation callback in QueryPhase
3+
area: Search
4+
type: bug
5+
issues: [130071]

docs/changelog/130510.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130510
2+
summary: Add fast path for single value in VALUES aggregator
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/130944.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 130944
2+
summary: Remove unnecessary calls to Fold
3+
area: ES|QL
4+
type: enhancement
5+
issues:
6+
- 119756

docs/reference/elasticsearch-plugins/cloud/ec-plugins-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ curl -X POST \
4949
-H "Authorization: ApiKey $CLOUD_API_KEY" \
5050
-H 'Content-Type: application/json' \
5151
-d '{
52-
"download_url" : "https://my_site/custom-plugin-8.4.3.zip",
52+
"download_url" : "<MY_SITE_URL>/custom-plugin-8.4.3.zip",
5353
"extension_type" : "plugin",
5454
"name" : "custom-plugin",
5555
"version" : "8.4.3"
@@ -323,7 +323,7 @@ curl -X POST \
323323
-H "Authorization: ApiKey $CLOUD_API_KEY" \
324324
-H 'Content-Type: application/json' \
325325
-d '{
326-
"download_url" : "https://my_site/custom-plugin-8.4.3-10212022.zip",
326+
"download_url" : "<MY_SITE_URL>/custom-plugin-8.4.3-10212022.zip",
327327
"extension_type" : "plugin",
328328
"name": "custom-plugin-10212022",
329329
"version" : "8.4.3"

docs/reference/elasticsearch-plugins/manage-plugins-using-configuration-file.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ plugins:
2525
- id: analysis-icu
2626
- id: repository-azure
2727
- id: custom-mapper
28-
location: https://example.com/archive/custom-mapper-1.0.0.zip
28+
location: <EXAMPLE_URL>/archive/custom-mapper-1.0.0.zip
2929
```
3030
3131
This example installs the official `analysis-icu` and `repository-azure` plugins, and one unofficial plugin. Every plugin must provide an `id`. Unofficial plugins must also provide a `location`. This is typically a URL, but Maven coordinates are also supported. The downloaded plugin’s name must match the ID in the configuration file.
@@ -35,7 +35,7 @@ While {{es}} will respect the [standard Java proxy system properties](https://do
3535
```yaml
3636
plugins:
3737
- id: custom-mapper
38-
location: https://example.com/archive/custom-mapper-1.0.0.zip
38+
location: <EXAMPLE_URL>/archive/custom-mapper-1.0.0.zip
3939
proxy: proxy.example.com:8443
4040
```
4141

docs/reference/elasticsearch-plugins/plugin-management-custom-url.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ HTTP
4646
: To install a plugin from an HTTP URL:
4747

4848
```shell
49-
sudo bin/elasticsearch-plugin install https://some.domain/path/to/plugin.zip
49+
sudo bin/elasticsearch-plugin install <EXAMPLE_PLUGIN_HOST_URL>/plugin.zip
5050
```
5151

5252
The plugin script will refuse to talk to an HTTPS URL with an untrusted certificate. To use a self-signed HTTPS cert, you will need to add the CA cert to a local Java truststore and pass the location to the script as follows:
5353

5454
```shell
55-
sudo CLI_JAVA_OPTS="-Djavax.net.ssl.trustStore=/path/to/trustStore.jks" bin/elasticsearch-plugin install https://host/plugin.zip
55+
sudo CLI_JAVA_OPTS="-Djavax.net.ssl.trustStore=/path/to/trustStore.jks" bin/elasticsearch-plugin install <MY_HOST_URL>/plugin.zip
5656
```
5757

5858

docs/reference/elasticsearch/command-line-tools/saml-metadata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,6 @@ bin/elasticsearch-saml-metadata --realm saml2 \
112112
--locale en-GB \
113113
--contacts \
114114
--organisation-name "Mega Corp. Finance Team" \
115-
--organisation-url "http://mega.example.com/finance/"
115+
--organisation-url "<EXAMPLE_URL>/finance/"
116116
```
117117

docs/reference/elasticsearch/configuration-reference/machine-learning-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ $$$xpack.ml.model_repository$$$
119119
or
120120

121121
```
122-
xpack.ml.model_repository: https://my-custom-backend
122+
xpack.ml.model_repository: <MY_CUSTOM_BACKEND_URL>
123123
```
124124

125125
If `xpack.ml.model_repository` is a file location, it must point to a subdirectory of the `config` directory of {{es}}.

0 commit comments

Comments
 (0)