Skip to content

Commit 33ee601

Browse files
Merge branch 'main' into case-analytics-indices-9.1-serv
2 parents 7bca4b7 + c501477 commit 33ee601

File tree

6 files changed

+84
-54
lines changed

6 files changed

+84
-54
lines changed

deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ Note that since version 2.7.0, system deployments are automatically upgraded whe
1616

1717
| {{ece}} version | Admin cluster | Logging & Metrics cluster | Security cluster |
1818
| --- | --- | --- | --- |
19+
| 4.0.2 | 8.18.8 | 8.18.8 | 8.18.8 |
1920
| 4.0.1 | 8.18.2 | 8.18.2 | 8.18.2 |
2021
| 4.0.0 | 8.18.0 | 8.18.0 | 8.18.0 |
22+
| 3.8.2 | 8.17.10 | 8.17.10 | 8.17.10 |
2123
| 3.8.1 | 8.17.4 | 8.17.4 | 8.17.4 |
2224
| 3.8.0 | 8.17.4 | 8.17.4 | 8.17.4 |
2325
| 3.7.3 | 7.17.24 | 7.17.24 | 8.15.2 |

deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ The first table contains the stack versions shipped with the current {{version.e
1717
| Docker images included with {{ece}} {{version.ece}} |
1818
| --- |
1919
| docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}} |
20-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2 |
21-
| docker.elastic.co/cloud-release/kibana-cloud:8.18.2 |
22-
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2 |
23-
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2 |
24-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1 |
25-
| docker.elastic.co/cloud-release/kibana-cloud:9.0.1 |
26-
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1 |
20+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.8 |
21+
| docker.elastic.co/cloud-release/kibana-cloud:8.18.8 |
22+
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8 |
23+
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8 |
24+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.8 |
25+
| docker.elastic.co/cloud-release/kibana-cloud:9.0.8 |
26+
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.8 |
2727

2828
$$$ece-all-stacks$$$Additional {{stack}} versions are available as Docker images that you can use with ECE. For offline installations, you need to download both the {{stack}} pack and the Docker images for the same version.
2929

@@ -173,11 +173,11 @@ Enterprise Search is not available in versions 9.0+.
173173
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8 | ECE 3.0.0 |
174174
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8 | ECE 3.0.0 |
175175
| | |
176-
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.18.7](https://download.elastic.co/cloud-enterprise/versions/8.18.7.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
177-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.7 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
178-
| docker.elastic.co/cloud-release/kibana-cloud:8.18.7 | ECE 3.0.0 |
179-
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.7 | ECE 3.0.0 |
180-
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.7 | ECE 3.0.0 |
176+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.18.8](https://download.elastic.co/cloud-enterprise/versions/8.18.8.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
177+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.8 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
178+
| docker.elastic.co/cloud-release/kibana-cloud:8.18.8 | ECE 3.0.0 |
179+
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8 | ECE 3.0.0 |
180+
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8 | ECE 3.0.0 |
181181
| | |
182182
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.18.6](https://download.elastic.co/cloud-enterprise/versions/8.18.6.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
183183
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.6 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |

deploy-manage/deploy/cloud-enterprise/ece-install-offline-no-registry.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ To perform an offline installation without a private Docker registry, you have t
1919

2020
```sh subs=true
2121
docker pull docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
22-
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2
23-
docker pull docker.elastic.co/cloud-release/kibana-cloud:8.18.2
24-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2
25-
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2
26-
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1
27-
docker pull docker.elastic.co/cloud-release/kibana-cloud:9.0.1
28-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1
22+
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.8
23+
docker pull docker.elastic.co/cloud-release/kibana-cloud:8.18.8
24+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8
25+
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8
26+
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.8
27+
docker pull docker.elastic.co/cloud-release/kibana-cloud:9.0.8
28+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.8
2929
```
3030

3131
::::{note}
@@ -36,27 +36,27 @@ To perform an offline installation without a private Docker registry, you have t
3636

3737
```sh subs=true
3838
docker save -o ece.{{version.ece}}.tar docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
39-
docker save -o es.8.18.2.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2
40-
docker save -o kibana.8.18.2.tar docker.elastic.co/cloud-release/kibana-cloud:8.18.2
41-
docker save -o apm.8.18.2.tar docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2
42-
docker save -o enterprise-search.8.18.2.tar docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2
43-
docker save -o es.9.0.1.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1
44-
docker save -o kibana.9.0.1.tar docker.elastic.co/cloud-release/kibana-cloud:9.0.1
45-
docker save -o apm.9.0.1.tar docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1
39+
docker save -o es.8.18.2.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.8
40+
docker save -o kibana.8.18.2.tar docker.elastic.co/cloud-release/kibana-cloud:8.18.8
41+
docker save -o apm.8.18.2.tar docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8
42+
docker save -o enterprise-search.8.18.2.tar docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8
43+
docker save -o es.9.0.1.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.8
44+
docker save -o kibana.9.0.1.tar docker.elastic.co/cloud-release/kibana-cloud:9.0.8
45+
docker save -o apm.9.0.1.tar docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.8
4646
```
4747

4848
3. Copy the .tar files to a location on your network where they are available to each host where you plan to install {{ece}}. Alternatively, you can copy the .tar files to each host directly.
4949
4. On each host, load the images into Docker, replacing `FILE_PATH` with the correct path to the .tar files:
5050

5151
```sh subs=true
5252
docker load < FILE_PATH/ece.{{version.ece}}.tar
53-
docker load < FILE_PATH/es.8.18.2.tar
54-
docker load < FILE_PATH/kibana.8.18.2.tar
55-
docker load < FILE_PATH/apm.8.18.2.tar
56-
docker load < FILE_PATH/enterprise-search.8.18.2.tar
57-
docker load < FILE_PATH/es.9.0.1.tar
58-
docker load < FILE_PATH/kibana.9.0.1.tar
59-
docker load < FILE_PATH/apm.9.0.1.tar
53+
docker load < FILE_PATH/es.8.18.8.tar
54+
docker load < FILE_PATH/kibana.8.18.8.tar
55+
docker load < FILE_PATH/apm.8.18.8.tar
56+
docker load < FILE_PATH/enterprise-search.8.18.8.tar
57+
docker load < FILE_PATH/es.9.0.8.tar
58+
docker load < FILE_PATH/kibana.9.0.8.tar
59+
docker load < FILE_PATH/apm.9.0.8.tar
6060
```
6161

6262
5. Optional: Remove the .tar files after installation.

deploy-manage/deploy/cloud-enterprise/ece-install-offline-with-registry.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ Installing ECE on multiple hosts with your own registry server is simpler, becau
2525

2626
```sh subs=true
2727
docker pull docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
28-
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2
29-
docker pull docker.elastic.co/cloud-release/kibana-cloud:8.18.2
30-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2
31-
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2
32-
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1
33-
docker pull docker.elastic.co/cloud-release/kibana-cloud:9.0.1
34-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1
28+
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.8
29+
docker pull docker.elastic.co/cloud-release/kibana-cloud:8.18.8
30+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8
31+
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8
32+
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.8
33+
docker pull docker.elastic.co/cloud-release/kibana-cloud:9.0.8
34+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.8
3535
```
3636

3737
::::{note}
@@ -42,26 +42,26 @@ Installing ECE on multiple hosts with your own registry server is simpler, becau
4242

4343
```sh subs=true
4444
docker tag docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}} REGISTRY/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
45-
docker tag docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2 REGISTRY/cloud-release/elasticsearch-cloud-ess:8.18.2
46-
docker tag docker.elastic.co/cloud-release/kibana-cloud:8.18.2 REGISTRY/cloud-release/kibana-cloud:8.18.2
47-
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2 REGISTRY/cloud-release/elastic-agent-cloud:8.18.2
48-
docker tag docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2 REGISTRY/cloud-release/enterprise-search-cloud:8.18.2
49-
docker tag docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1 REGISTRY/cloud-release/elasticsearch-cloud-ess:9.0.1
50-
docker tag docker.elastic.co/cloud-release/kibana-cloud:9.0.1 REGISTRY/cloud-release/kibana-cloud:9.0.1
51-
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1 REGISTRY/cloud-release/elastic-agent-cloud:9.0.1
45+
docker tag docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2 REGISTRY/cloud-release/elasticsearch-cloud-ess:8.18.8
46+
docker tag docker.elastic.co/cloud-release/kibana-cloud:8.18.2 REGISTRY/cloud-release/kibana-cloud:8.18.8
47+
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2 REGISTRY/cloud-release/elastic-agent-cloud:8.18.8
48+
docker tag docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2 REGISTRY/cloud-release/enterprise-search-cloud:8.18.8
49+
docker tag docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1 REGISTRY/cloud-release/elasticsearch-cloud-ess:9.0.8
50+
docker tag docker.elastic.co/cloud-release/kibana-cloud:9.0.1 REGISTRY/cloud-release/kibana-cloud:9.0.8
51+
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1 REGISTRY/cloud-release/elastic-agent-cloud:9.0.8
5252
```
5353

5454
4. Push the Docker images to your private Docker registry, using the same tags from the previous step. Replace `REGISTRY` with your actual registry URL, for example `my.private.repo:5000`:
5555

5656
```sh subs=true
5757
docker push REGISTRY/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
58-
docker push REGISTRY/cloud-release/elasticsearch-cloud-ess:8.18.2
59-
docker push REGISTRY/cloud-release/kibana-cloud:8.18.2
60-
docker push REGISTRY/cloud-release/elastic-agent-cloud:8.18.2
61-
docker push REGISTRY/cloud-release/enterprise-search-cloud:8.18.2
62-
docker push REGISTRY/cloud-release/elasticsearch-cloud-ess:9.0.1
63-
docker push REGISTRY/cloud-release/kibana-cloud:9.0.1
64-
docker push REGISTRY/cloud-release/elastic-agent-cloud:9.0.1
58+
docker push REGISTRY/cloud-release/elasticsearch-cloud-ess:8.18.8
59+
docker push REGISTRY/cloud-release/kibana-cloud:8.18.8
60+
docker push REGISTRY/cloud-release/elastic-agent-cloud:8.18.8
61+
docker push REGISTRY/cloud-release/enterprise-search-cloud:8.18.8
62+
docker push REGISTRY/cloud-release/elasticsearch-cloud-ess:9.0.8
63+
docker push REGISTRY/cloud-release/kibana-cloud:9.0.8
64+
docker push REGISTRY/cloud-release/elastic-agent-cloud:9.0.8
6565
```
6666

6767
5. On an internet-connected host, download the installation script:

reference/fleet/agent-command-reference.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,12 @@ elastic-agent enroll --url <string>
146146
[--force]
147147
[--header <strings>]
148148
[--help]
149+
[--id <string>]
149150
[--insecure ]
150151
[--proxy-disabled]
151152
[--proxy-header <strings>]
152153
[--proxy-url <string>]
154+
[--replace-token <string>]
153155
[--staging <string>]
154156
[--tag <string>]
155157
[global-flags]
@@ -298,6 +300,13 @@ For more information about custom certificates, refer to [Configure SSL/TLS for
298300
`--help`
299301
: Show help for the `enroll` command.
300302

303+
`--id <string>`
304+
: Specifies the unique identifier (agent ID) to use when enrolling the {{agent}} with {{fleet-server}}. This setting is useful when restoring a previously enrolled agent or in stateless environments where the agent cannot persist enrollment data between redeployments.
305+
306+
:::{note}
307+
If an agent with the same ID is already enrolled in {{fleet}}, enrollment will fail unless a valid replacement token is provided using the `--replace-token` flag.
308+
:::
309+
301310
`--insecure`
302311
: Allow the {{agent}} to connect to {{fleet-server}} over insecure connections. This setting is required in the following situations:
303312

@@ -317,6 +326,13 @@ For more information about custom certificates, refer to [Configure SSL/TLS for
317326
`--proxy-url <string>`
318327
: Configures the proxy URL.
319328

329+
`--replace-token <string>`
330+
: Specifies a token that can be used to replace the {{agent}} after its enrollment in {{fleet-server}}. The token must be provided when enrolling an agent with a specific agent ID for the first time. Subsequently, the agent can be replaced by enrolling another agent using the same agent ID and replacement token. Once replaced, the original agent can no longer communicate with {{fleet}}.
331+
332+
:::{note}
333+
If an {{agent}} is enrolled without a replacement token, it cannot be replaced by another agent with the same ID. This mechanism prevents accidental or malicious takeovers by requiring the replacement token to match the hashed token stored in {{fleet}}.
334+
:::
335+
320336
`--staging <string>`
321337
: Configures agent to download artifacts from a staging build.
322338

@@ -380,6 +396,16 @@ elastic-agent enroll --url=https://fleet-server:8220 \
380396
--certificate-authorities=/path/to/ca.crt
381397
```
382398

399+
Replace an {{agent}} enrolled in {{fleet-server}} with a specific agent ID and a replacement token:
400+
401+
```shell
402+
elastic-agent enroll \
403+
--url=https://fleet-server:8220 \
404+
--enrollment-token=ENROLLMENT_TOKEN_HASH \
405+
--id=MY_AGENT_ID \
406+
--replace-token=REPLACEMENT_TOKEN_HASH
407+
```
408+
383409

384410
## elastic-agent help [elastic-agent-help-command]
385411

reference/fleet/agent-environment-variables.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,13 @@ Settings used to enroll an {{agent}} into a {{fleet-server}}.
8686
| $$$env-enroll-elastic-agent-cert$$$<br>`ELASTIC_AGENT_CERT`<br> | (string) The path to the mutual TLS client certificate that {{agent}} will use to connect to {{fleet-server}}.<br> |
8787
| $$$env-enroll-elastic-agent-cert-key$$$<br>`ELASTIC_AGENT_CERT_KEY`<br> | (string) The path to the mutual TLS private key that {{agent}} will use to connect to {{fleet-server}}.<br> |
8888
| $$$env-enroll-elastic-agent-cert-key-passphrase$$$<br>`ELASTIC_AGENT_CERT_KEY_PASSPHRASE`<br> | (string) The path to the file that contains the passphrase for the mutual TLS private key that {{agent}} will use to connect to {{fleet-server}}. The file must only contain the characters of the passphrase, no newline or extra non-printing characters.<br><br>This option is only used if the `--elastic-agent-cert-key` is encrypted and requires a passphrase to use.<br> |
89+
| $$$env-enroll-elastic-agent-id$$$<br>`ELASTIC_AGENT_ID`<br> | (string) The unique identifier (agent ID) to use when enrolling the {{agent}} with {{fleet-server}}. This setting is useful when restoring a previously enrolled agent or in stateless containerized environments where the agent cannot persist enrollment data between redeployments.<br><br>If an agent with the same ID is already enrolled in {{fleet}}, enrollment will fail unless a valid replacement token is provided using the `FLEET_REPLACE_TOKEN` environment variable.<br><br>**Default:** `""`<br> |
8990
| $$$env-enroll-elastic-agent-tag$$$<br>`ELASTIC_AGENT_TAGS`<br> | (string) A comma-separated list of tags to apply to {{fleet}}-managed {{agent}}s. You can use these tags to filter the list of agents in {{fleet}}.<br> |
9091
| $$$env-enroll-fleet-enroll$$$<br>`FLEET_ENROLL`<br> | (bool) Set to `1` to enroll the {{agent}} into {{fleet-server}}.<br><br>**Default:** `false`<br> |
9192
| $$$env-enroll-fleet-force$$$<br>`FLEET_FORCE`<br> | (bool) Set to `true` to force overwrite of the current {{agent}} configuration without prompting for confirmation. This flag is helpful when using automation software or scripted deployments.<br><br>**Default:** `false`<br> |
9293
| $$$env-enroll-fleet-url$$$<br>`FLEET_URL`<br> | (string) URL to enroll the {{fleet-server}} into.<br><br>**Default:** `""`<br> |
9394
| $$$env-enroll-fleet-enrollment-token$$$<br>`FLEET_ENROLLMENT_TOKEN`<br> | (string) The token to use for enrollment.<br><br>**Default:** `""`<br> |
95+
| $$$env-enroll-fleet-replace-token$$$<br>`FLEET_REPLACE_TOKEN`<br> | (string) The token that can be used to replace the {{agent}} after it is enrolled in {{fleet-server}}. The `FLEET_REPLACE_TOKEN` environment variable must be provided when enrolling an agent with a specific agent ID for the first time. Subsequently, the agent can be replaced by enrolling another agent using the same `ELASTIC_AGENT_ID` and `FLEET_REPLACE_TOKEN` environment variables. Once replaced, the original agent can no longer communicate with {{fleet}}.<br><br>If an {{agent}} is enrolled without a replacement token, it cannot be replaced by another agent with the same ID. This mechanism prevents accidental or malicious takeovers by requiring the replacement token to match the hashed token stored in {{fleet}}.<br><br>**Default:** `""`<br> |
9496
| $$$env-enroll-fleet-token-name$$$<br>`FLEET_TOKEN_NAME`<br> | (string) The token name to use to fetch the token from {{kib}}.<br><br>**Default:** `""`<br> |
9597
| $$$env-enroll-fleet-token-policy-name$$$<br>`FLEET_TOKEN_POLICY_NAME`<br> | (string) The token policy name to use to fetch the token from {{kib}}.<br><br>**Default:** `false`<br> |
9698
| $$$env-enroll-fleet-ca$$$<br>`FLEET_CA`<br> | (string) The path to a certificate authority. Overrides `ELASTICSEARCH_CA` when set.<br><br>By default, {{agent}} uses the list of trusted certificate authorities (CA) from the operating system where it is running. If the certificate authority that signed your node certificates is not in the host system’s trusted certificate authorities list, use this config to add the path to the `.pem` file that contains your CA’s certificate.<br><br>**Default:** `false`<br> |

0 commit comments

Comments
 (0)