Skip to content

Commit b668c2f

Browse files
weizijunweizijun
committed
Merge branch 'main' into rollup-use-smile-to-replace-map
* main: (34 commits) Make sure ivy repo directory exists before downloading artifacts Use 'file://' scheme for local repository URL Use DRA artifacts for release build CI jobs Log unsuccessful attempts to get credentials from web identity tokens (elastic#88241) Script: Write Field API path manipulation (elastic#89889) Fetch health info action (elastic#89820) Fix memory leak in TransportDeleteExpiredDataAction (elastic#89935) [ML] Performance improvements for categorization jobs (elastic#89824) [DOCS] Revert changes for ES_JAVA_OPTS (elastic#89931) Fix deadlock bug exposed by a test (elastic#89934) [Downsampling] Remove `FieldValueFetcher` validator (elastic#89497) Fix segment stats in tsdb (elastic#89754) Synthetic _source: support dense_vector (elastic#89840) REST tests fetching fields with synthetic _source (elastic#89888) Do not deserialize back BytesTransportRequest to clone a request in MockTransportService (elastic#89926) Add SDK request logging to debug failures of S3BlobStoreRepositoryTests#testRequestStats (elastic#89912) Fix SnapshotStatusApisIT.testGetSnapshotsWithSnapshotInProgress (elastic#89925) Document synthetic source for text and keyword (elastic#89893) Fix CloneSnapshotIT.testRemoveFailedCloneFromCSWithQueuedSnapshotInProgress (elastic#89914) Add missing index.mapping.total_fields.limit setting to the target index (elastic#89875) ...
2 parents ba10533 + a4d648a commit b668c2f

File tree

109 files changed

+6399
-1239
lines changed

Some content is hidden

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

109 files changed

+6399
-1239
lines changed

‎.ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@
2222
export BEATS_DIR=$(pwd)/distribution/docker/build/artifacts/beats
2323
2424
mkdir -p ${BEATS_DIR}
25-
curl --fail -o "${BEATS_DIR}/metricbeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/metricbeat/metricbeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
26-
curl --fail -o "${BEATS_DIR}/filebeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/filebeat/filebeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
25+
curl --fail -o "${BEATS_DIR}/metricbeat-${ES_VERSION}-linux-x86_64.tar.gz" https://artifacts-snapshot.elastic.co/beats/${ES_VERSION}-SNAPSHOT/downloads/beats/metricbeat/metricbeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
26+
curl --fail -o "${BEATS_DIR}/filebeat-${ES_VERSION}-linux-x86_64.tar.gz" https://artifacts-snapshot.elastic.co/beats/${ES_VERSION}-SNAPSHOT/downloads/beats/filebeat/filebeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
2727
28-
$WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false \
28+
# Fetch ML artifacts
29+
export ML_IVY_REPO=$(mktemp -d)
30+
mkdir -p ${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}
31+
curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/ml-cpp-${ES_VERSION}-deps.zip" https://artifacts-snapshot.elastic.co/ml-cpp/${ES_VERSION}-SNAPSHOT/downloads/ml-cpp/ml-cpp-${ES_VERSION}-SNAPSHOT-deps.zip
32+
curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/ml-cpp-${ES_VERSION}-nodeps.zip" https://artifacts-snapshot.elastic.co/ml-cpp/${ES_VERSION}-SNAPSHOT/downloads/ml-cpp/ml-cpp-${ES_VERSION}-SNAPSHOT-nodeps.zip
33+
34+
$WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false -Dbuild.ml_cpp.repo=file://${ML_IVY_REPO} \
2935
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef build

‎.ci/jobs.t/elastic+elasticsearch+pull-request+release-tests.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,14 @@
4444
export BEATS_DIR=$(pwd)/distribution/docker/build/artifacts/beats
4545
4646
mkdir -p ${BEATS_DIR}
47-
curl -o "${BEATS_DIR}/metricbeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/metricbeat/metricbeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
48-
curl -o "${BEATS_DIR}/filebeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/filebeat/filebeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
47+
curl --fail -o "${BEATS_DIR}/metricbeat-${ES_VERSION}-linux-x86_64.tar.gz" https://artifacts-snapshot.elastic.co/beats/${ES_VERSION}-SNAPSHOT/downloads/beats/metricbeat/metricbeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
48+
curl --fail -o "${BEATS_DIR}/filebeat-${ES_VERSION}-linux-x86_64.tar.gz" https://artifacts-snapshot.elastic.co/beats/${ES_VERSION}-SNAPSHOT/downloads/beats/filebeat/filebeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
4949
50-
$WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false \
50+
# Fetch ML artifacts
51+
export ML_IVY_REPO=$(mktemp -d)
52+
mkdir -p ${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}
53+
curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/ml-cpp-${ES_VERSION}-deps.zip" https://artifacts-snapshot.elastic.co/ml-cpp/${ES_VERSION}-SNAPSHOT/downloads/ml-cpp/ml-cpp-${ES_VERSION}-SNAPSHOT-deps.zip
54+
curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/ml-cpp-${ES_VERSION}-nodeps.zip" https://artifacts-snapshot.elastic.co/ml-cpp/${ES_VERSION}-SNAPSHOT/downloads/ml-cpp/ml-cpp-${ES_VERSION}-SNAPSHOT-nodeps.zip
55+
56+
$WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false -Dbuild.ml_cpp.repo=file://${ML_IVY_REPO} \
5157
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef build

‎docs/changelog/86388.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 86388
2+
summary: Do not use recovery from snapshots in searchable snapshots
3+
area: Recovery
4+
type: enhancement
5+
issues: []

‎docs/changelog/88209.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 88209
2+
summary: Prioritize shard snapshot tasks over file snapshot tasks and limit the number of the concurrently running snapshot tasks
3+
area: Snapshot/Restore
4+
type: enhancement
5+
issues:
6+
- 83408

‎docs/changelog/88241.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 88241
2+
summary: Log unsuccessful attempts to get credentials from web identity tokens
3+
area: Allocation
4+
type: enhancement
5+
issues: []

‎docs/changelog/89754.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 89754
2+
summary: Fix segment stats in tsdb
3+
area: TSDB
4+
type: bug
5+
issues:
6+
- 89609

‎docs/changelog/89840.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 89840
2+
summary: "Synthetic _source: support `dense_vector`"
3+
area: Vector Search
4+
type: feature
5+
issues: []

‎docs/changelog/89845.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 89845
2+
summary: "Fleet: Add `upgrade_status` attributes to agents"
3+
area: Infra/Core
4+
type: enhancement
5+
issues: []

‎docs/changelog/89851.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 89851
2+
summary: Distinguish no shutdowns case in `NodeShutdownAllocationDecider`
3+
area: Infra/Node Lifecycle
4+
type: enhancement
5+
issues:
6+
- 89823

‎docs/changelog/89889.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 89889
2+
summary: "Script: Write Field API path manipulation"
3+
area: Infra/Scripting
4+
type: enhancement
5+
issues: []

‎docs/changelog/89934.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 89934
2+
summary: Fix deadlock bug exposed by the test
3+
area: Infra/Core
4+
type: bug
5+
issues: []

‎docs/changelog/89935.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 89935
2+
summary: Fix memory leak in `TransportDeleteExpiredDataAction`
3+
area: Machine Learning
4+
type: bug
5+
issues: []

‎docs/reference/index-modules.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ specific index module:
3939
`index.number_of_shards`::
4040
The number of primary shards that an index should have. Defaults to `1`. This setting can only be set at index creation time. It cannot be changed on a closed index.
4141
+
42-
NOTE: The number of shards are limited to `1024` per index. This limitation is a safety limit to prevent accidental creation of indices that can destabilize a cluster due to resource allocation. The limit can be modified by specifying `export CLI_JAVA_OPTS="-Des.index.max_number_of_shards=128"` system property on every node that is part of the cluster.
42+
NOTE: The number of shards are limited to `1024` per index. This limitation is a safety limit to prevent accidental creation of indices that can destabilize a cluster due to resource allocation. The limit can be modified by specifying `export ES_JAVA_OPTS="-Des.index.max_number_of_shards=128"` system property on every node that is part of the cluster.
4343

4444
// end::index-number-of-shards-tag[]
4545

‎docs/reference/mapping/fields/synthetic-source.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ types:
3131
** <<aggregate-metric-double-synthetic-source, `aggregate_metric_double`>>
3232
** <<boolean-synthetic-source,`boolean`>>
3333
** <<numeric-synthetic-source,`byte`>>
34+
** <<dense-vector-synthetic-source,`dense_vector`>>
3435
** <<numeric-synthetic-source,`double`>>
3536
** <<numeric-synthetic-source,`float`>>
3637
** <<geo-point-synthetic-source,`geo_point`>>

‎docs/reference/mapping/types/dense-vector.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,3 +178,7 @@ Defaults to `16`.
178178
The number of candidates to track while assembling the list of nearest
179179
neighbors for each new node. Defaults to `100`.
180180
====
181+
182+
[[dense-vector-synthetic-source]]
183+
==== Synthetic source preview:[]
184+
`dense_vector` fields support <<synthetic-source,synthetic `_source`>> .

‎docs/reference/mapping/types/keyword.asciidoc

Lines changed: 65 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,11 @@ Dimension fields have the following constraints:
173173
==== Synthetic source preview:[]
174174
`keyword` fields support <<synthetic-source,synthetic `_source`>> in their
175175
default configuration. Synthetic `_source` cannot be used together with
176-
<<ignore-above,`ignore_above`>>, a <<normalizer,`normalizer`>>,
177-
<<copy-to,`copy_to`>>, or with <<doc-values,`doc_values`>> disabled.
176+
a <<normalizer,`normalizer`>> or <<copy-to,`copy_to`>>.
178177

179-
Synthetic source always sorts `keyword` fields and removes duplicates. For
180-
example:
181-
[source,console,id=synthetic-source-keyword-example]
178+
By default, synthetic source sorts `keyword` fields and removes duplicates.
179+
For example:
180+
[source,console,id=synthetic-source-keyword-example-default]
182181
----
183182
PUT idx
184183
{
@@ -206,6 +205,67 @@ Will become:
206205
----
207206
// TEST[s/^/{"_source":/ s/\n$/}/]
208207

208+
If a `keyword` field sets `store` to `true` then order and duplicates
209+
are preserved. For example:
210+
[source,console,id=synthetic-source-keyword-example-stored]
211+
----
212+
PUT idx
213+
{
214+
"mappings": {
215+
"_source": { "mode": "synthetic" },
216+
"properties": {
217+
"kwd": { "type": "keyword", "store": true }
218+
}
219+
}
220+
}
221+
PUT idx/_doc/1
222+
{
223+
"kwd": ["foo", "foo", "bar", "baz"]
224+
}
225+
----
226+
// TEST[s/$/\nGET idx\/_doc\/1?filter_path=_source\n/]
227+
228+
Will become:
229+
230+
[source,console-result]
231+
----
232+
{
233+
"kwd": ["foo", "foo", "bar", "baz"]
234+
}
235+
----
236+
// TEST[s/^/{"_source":/ s/\n$/}/]
237+
238+
Values longer than `ignore_above` are preserved but sorted to the end.
239+
For example:
240+
[source,console,id=synthetic-source-keyword-example-ignore-above]
241+
----
242+
PUT idx
243+
{
244+
"mappings": {
245+
"_source": { "mode": "synthetic" },
246+
"properties": {
247+
"kwd": { "type": "keyword", "ignore_above": 3 }
248+
}
249+
}
250+
}
251+
PUT idx/_doc/1
252+
{
253+
"kwd": ["foo", "foo", "bang", "bar", "baz"]
254+
}
255+
----
256+
// TEST[s/$/\nGET idx\/_doc\/1?filter_path=_source\n/]
257+
258+
Will become:
259+
260+
[source,console-result]
261+
----
262+
{
263+
"kwd": ["bar", "baz", "foo", "bang"]
264+
}
265+
----
266+
// TEST[s/^/{"_source":/ s/\n$/}/]
267+
268+
209269
include::constant-keyword.asciidoc[]
210270

211271
include::wildcard.asciidoc[]

‎docs/reference/mapping/types/text.asciidoc

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,14 @@ The following parameters are accepted by `text` fields:
162162
[[text-synthetic-source]]
163163
==== Synthetic source preview:[]
164164
`text` fields support <<synthetic-source,synthetic `_source`>> if they have
165-
a `keyword` sub-field that supports synthetic `_source` and *do not* have
166-
<<copy-to,`copy_to`>>.
167-
168-
Synthetic source always sorts `keyword` fields and removes duplicates, so
169-
`text` fields are sorted based on the sub-`keyword` field. For example:
170-
[source,console,id=synthetic-source-text-example]
165+
a <<keyword-synthetic-source, `keyword`>> sub-field that supports synthetic
166+
`_source` or if the `text` field sets `store` to `true`. Either way, it may
167+
not have <<copy-to,`copy_to`>>.
168+
169+
If using a sub-`keyword` field then the values are sorted in the same way as
170+
a `keyword` field's values are sorted. By default, that means sorted with
171+
duplicates removed. So:
172+
[source,console,id=synthetic-source-text-example-default]
171173
----
172174
PUT idx
173175
{
@@ -214,6 +216,43 @@ NOTE: Reordering text fields can have an effect on <<query-dsl-match-query-phras
214216
can avoid this by making sure the `slop` parameter on the phrase queries
215217
is lower than the `position_increment_gap`. This is the default.
216218

219+
If the `text` field sets `store` to true then order and duplicates
220+
are preserved.
221+
[source,console,id=synthetic-source-text-example-stored]
222+
----
223+
PUT idx
224+
{
225+
"mappings": {
226+
"_source": { "mode": "synthetic" },
227+
"properties": {
228+
"text": { "type": "text", "store": true }
229+
}
230+
}
231+
}
232+
PUT idx/_doc/1
233+
{
234+
"text": [
235+
"the quick brown fox",
236+
"the quick brown fox",
237+
"jumped over the lazy dog"
238+
]
239+
}
240+
----
241+
// TEST[s/$/\nGET idx\/_doc\/1?filter_path=_source\n/]
242+
243+
Will become:
244+
[source,console-result]
245+
----
246+
{
247+
"text": [
248+
"the quick brown fox",
249+
"the quick brown fox",
250+
"jumped over the lazy dog"
251+
]
252+
}
253+
----
254+
// TEST[s/^/{"_source":/ s/\n$/}/]
255+
217256
[[fielddata-mapping-param]]
218257
==== `fielddata` mapping parameter
219258

‎docs/reference/ml/common/apis/get-ml-info.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ This is a possible response:
9797
"GMT",
9898
"UTC"
9999
]
100+
},
101+
{
102+
"type": "limit",
103+
"max_token_count": "100"
100104
}
101105
]
102106
},

‎docs/reference/setup/advanced-configuration.asciidoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ is recommended in most circumstances.
99
==== Set JVM options
1010

1111
If needed, you can override the default JVM options by adding custom options
12-
files (preferred) or setting the `CLI_JAVA_OPTS` environment variable.
12+
files (preferred) or setting the `ES_JAVA_OPTS` environment variable.
1313

1414
JVM options files must have the suffix '.options' and contain a line-delimited
1515
list of JVM arguments. JVM processes options files in lexicographic order.
@@ -70,16 +70,16 @@ as valid JVM arguments are rejected and {es} will fail to start.
7070

7171
In production, use JVM options files to override the
7272
default settings. In testing and development environments,
73-
you can also set JVM options through the `CLI_JAVA_OPTS` environment variable.
73+
you can also set JVM options through the `ES_JAVA_OPTS` environment variable.
7474

7575
[source,sh]
7676
---------------------------------
77-
export CLI_JAVA_OPTS="$CLI_JAVA_OPTS -Djava.io.tmpdir=/path/to/temp/dir"
77+
export ES_JAVA_OPTS="$ES_JAVA_OPTS -Djava.io.tmpdir=/path/to/temp/dir"
7878
./bin/elasticsearch
7979
---------------------------------
8080

8181
If you're using the RPM or Debian packages, you can specify
82-
`CLI_JAVA_OPTS` in the <<sysconfig,system configuration file>>.
82+
`ES_JAVA_OPTS` in the <<sysconfig,system configuration file>>.
8383

8484
NOTE: {es} ignores the `JAVA_TOOL_OPTIONS` and `JAVA_OPTS` environment variables.
8585

@@ -141,16 +141,16 @@ For example, to set the maximum heap size to 2GB, set both `Xms` and `Xmx` to `2
141141
-Xmx2g
142142
------------------
143143

144-
For testing, you can also set the heap sizes using the `CLI_JAVA_OPTS`
144+
For testing, you can also set the heap sizes using the `ES_JAVA_OPTS`
145145
environment variable:
146146

147147
[source,sh]
148148
------------------
149-
CLI_JAVA_OPTS="-Xms2g -Xmx2g" ./bin/elasticsearch
149+
ES_JAVA_OPTS="-Xms2g -Xmx2g" ./bin/elasticsearch
150150
------------------
151151

152-
The `CLI_JAVA_OPTS` variable overrides all other JVM
153-
options. We do not recommend using `CLI_JAVA_OPTS` in production.
152+
The `ES_JAVA_OPTS` variable overrides all other JVM
153+
options. We do not recommend using `ES_JAVA_OPTS` in production.
154154

155155
NOTE: If you are running {es} as a Windows service, you can change the heap size
156156
using the service manager. See <<windows-service>>.

‎docs/reference/setup/important-settings/gc-logging.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ Change the default GC log output location to `/opt/my-app/gc.log` by
4242

4343
Configure an {es} <<docker,Docker container>> to send GC debug logs to
4444
standard error (`stderr`). This lets the container orchestrator
45-
handle the output. If using the `CLI_JAVA_OPTS` environment variable,
45+
handle the output. If using the `ES_JAVA_OPTS` environment variable,
4646
specify:
4747

4848
[source,sh]
4949
----
5050
MY_OPTS="-Xlog:disable -Xlog:all=warning:stderr:utctime,level,tags -Xlog:gc=debug:stderr:utctime"
51-
docker run -e CLI_JAVA_OPTS="$MY_OPTS" # etc
51+
docker run -e ES_JAVA_OPTS="$MY_OPTS" # etc
5252
----

‎docs/reference/setup/install/docker.asciidoc

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ endif::[]
192192
If you experience issues where the container where your first node is running
193193
exits when your second node starts, explicitly set values for the JVM heap size.
194194
To <<set-jvm-heap-size,manually configure the heap size>>, include the
195-
`CLI_JAVA_OPTS` variable and set values for `-Xms` and `-Xmx` when starting each
195+
`ES_JAVA_OPTS` variable and set values for `-Xms` and `-Xmx` when starting each
196196
node. For example, the following command starts node `es02` and sets the
197197
minimum and maximum JVM heap size to 1 GB:
198198

199199
[source,sh,subs="attributes"]
200200
----
201-
docker run -e CLI_JAVA_OPTS="-Xms1g -Xmx1g" -e ENROLLMENT_TOKEN="<token>" --name es02 -p 9201:9200 --net elastic -it docker.elastic.co/elasticsearch/elasticsearch:{docker-image}
201+
docker run -e ES_JAVA_OPTS="-Xms1g -Xmx1g" -e ENROLLMENT_TOKEN="<token>" --name es02 -p 9201:9200 --net elastic -it docker.elastic.co/elasticsearch/elasticsearch:{docker-image}
202202
----
203203

204204
===== Next steps
@@ -263,6 +263,10 @@ password for the `elastic` and `kibana_system` users with the
263263
`ELASTIC_PASSWORD` and `KIBANA_PASSWORD` variables. These variable are
264264
referenced by the `docker-compose.yml` file.
265265

266+
IMPORTANT: Your passwords must be alphanumeric, and cannot contain special
267+
characters such as `!` or `@`. The `bash` script included in the
268+
`docker-compose.yml` file only operates on alphanumeric characters.
269+
266270
["source","txt",subs="attributes"]
267271
----
268272
include::docker/.env[]
@@ -500,10 +504,10 @@ To manually set the heap size in production, bind mount a <<set-jvm-options,JVM
500504
options>> file under `/usr/share/elasticsearch/config/jvm.options.d` that
501505
includes your desired <<set-jvm-heap-size,heap size>> settings.
502506

503-
For testing, you can also manually set the heap size using the `CLI_JAVA_OPTS`
507+
For testing, you can also manually set the heap size using the `ES_JAVA_OPTS`
504508
environment variable. For example, to use 16GB, specify `-e
505-
CLI_JAVA_OPTS="-Xms16g -Xmx16g"` with `docker run`. The `CLI_JAVA_OPTS` variable
506-
overrides all other JVM options. We do not recommend using `CLI_JAVA_OPTS` in
509+
ES_JAVA_OPTS="-Xms16g -Xmx16g"` with `docker run`. The `ES_JAVA_OPTS` variable
510+
overrides all other JVM options. We do not recommend using `ES_JAVA_OPTS` in
507511
production. The `docker-compose.yml` file above sets the heap size to 512MB.
508512

509513

‎docs/reference/setup/install/sysconfig-file.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
`jvm.options`, and `log4j2.properties` files); defaults to
1010
`/etc/elasticsearch`.
1111

12-
`CLI_JAVA_OPTS`::
12+
`ES_JAVA_OPTS`::
1313

1414
Any additional JVM system properties you may want to apply.
1515

0 commit comments

Comments
 (0)