Skip to content

Commit f073e39

Browse files
committed
Add missing environment variables for container setup
1 parent 86de30a commit f073e39

File tree

2 files changed

+91
-16
lines changed

2 files changed

+91
-16
lines changed

docs/en/ingest-management/elastic-agent/configuration/env/container-envs.asciidoc

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ Settings used to prepare the {fleet} plugin in {kib}.
6666
|===
6767
| Settings | Description
6868

69-
include::shared-env.asciidoc[tag=kibana-fleet-setup]
70-
7169
include::shared-env.asciidoc[tag=kibana-fleet-host]
7270

7371
include::shared-env.asciidoc[tag=kibana-fleet-username]
@@ -92,12 +90,20 @@ At least one {fleet-server} is required in a deployment.
9290
|===
9391
| Settings | Description
9492

93+
include::shared-env.asciidoc[tag=fleet-force]
94+
95+
include::shared-env.asciidoc[tag=fleet-server-client-auth]
96+
9597
include::shared-env.asciidoc[tag=fleet-server-enable]
9698

9799
include::shared-env.asciidoc[tag=fleet-server-elasticsearch-host]
98100

99101
include::shared-env.asciidoc[tag=fleet-server-elasticsearch-ca]
100102

103+
include::shared-env.asciidoc[tag=fleet-server-es-cert]
104+
105+
include::shared-env.asciidoc[tag=fleet-server-es-cert-key]
106+
101107
include::shared-env.asciidoc[tag=fleet-server-service-token]
102108

103109
include::shared-env.asciidoc[tag=fleet-server-service-token-path]
@@ -133,10 +139,17 @@ Settings used to enroll an {agent} into a {fleet-server}.
133139
|===
134140
| Settings | Description
135141

142+
143+
include::shared-env.asciidoc[tag=elastic-agent-cert]
144+
145+
include::shared-env.asciidoc[tag=elastic-agent-cert-key]
146+
136147
include::shared-env.asciidoc[tag=elastic-agent-tag]
137148

138149
include::shared-env.asciidoc[tag=fleet-enroll]
139150

151+
include::shared-env.asciidoc[tag=fleet-force]
152+
140153
include::shared-env.asciidoc[tag=fleet-url]
141154

142155
include::shared-env.asciidoc[tag=fleet-enrollment-token]

docs/en/ingest-management/elastic-agent/configuration/env/shared-env.asciidoc

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,37 @@ OPTIONAL INFO AND EXAMPLE
1717

1818
// =============================================================================
1919

20-
// tag::elastic-agent-tag[]
20+
// tag::elastic-agent-cert[]
2121
|
22-
[id="env-{type}-elastic-agent-tag"]
23-
`ELASTIC_AGENT_TAGS`
22+
[id="env-{type}-elastic-agent-cert"]
23+
`ELASTIC_AGENT_CERT`
2424

25-
| (string) A comma-separated list of tags to apply to {fleet}-managed {agent}s.
26-
You can use these tags to filter the list of agents in {fleet}.
25+
| (string) The path to the mutual TLS client certificate that that {agent} will use to connect to {fleet-server}.
2726

28-
// end::elastic-agent-tag[]
27+
// end::elastic-agent-cert[]
2928

3029
// =============================================================================
3130

32-
// tag::kibana-fleet-setup[]
31+
// tag::elastic-agent-cert-key[]
3332
|
34-
[id="env-{type}-kibana-fleet-setup"]
35-
`KIBANA_FLEET_SETUP`
33+
[id="env-{type}-elastic-agent-cert-key"]
34+
`ELASTIC_AGENT_CERT_KEY`
3635

37-
| (int) Set to `1` to enable {fleet} setup.
38-
Enabling {fleet} is required before {fleet-server} will start.
39-
When this action is not performed, a user must manually log in to {kib} and visit the {fleet} page to enable setup.
36+
| (string) The path to the mutual TLS private key that that {agent} will use to connect to {fleet-server}.
4037

41-
*Default:* none
38+
// end::elastic-agent-cert-key[]
4239

43-
// end::kibana-fleet-setup[]
40+
// =============================================================================
41+
42+
// tag::elastic-agent-tag[]
43+
|
44+
[id="env-{type}-elastic-agent-tag"]
45+
`ELASTIC_AGENT_TAGS`
46+
47+
| (string) A comma-separated list of tags to apply to {fleet}-managed {agent}s.
48+
You can use these tags to filter the list of agents in {fleet}.
49+
50+
// end::elastic-agent-tag[]
4451

4552
// =============================================================================
4653

@@ -105,6 +112,20 @@ contains your CA's certificate.
105112

106113
// =============================================================================
107114

115+
// tag::fleet-force[]
116+
|
117+
[id="env-{type}-fleet-force"]
118+
`FLEET_FORCE`
119+
120+
| (int) Set to `1` to force overwrite of the current configuration without prompting for confirmation.
121+
This flag is helpful when using automation software or scripted deployments.
122+
123+
*Default:* none
124+
125+
// end::fleet-force[]
126+
127+
// =============================================================================
128+
108129
// tag::fleet-server-enable[]
109130
|
110131
[id="env-{type}-fleet-server-enable"]
@@ -273,6 +294,21 @@ Overrides the port defined in the policy.
273294

274295
// =============================================================================
275296

297+
// tag::fleet-server-client-auth[]
298+
|
299+
[id="env-{type}-fleet-server-client-auth"]
300+
`FLEET_SERVER_CLIENT_AUTH`
301+
302+
| (string) One of `none`, `optional`, or `required`.
303+
{fleet-server}'s client authentication option for client mTLS connections.
304+
If `optional` or `required` is specified, client certificates are verified using CAs.
305+
306+
*Default:* none
307+
308+
// end::fleet-server-client-auth[]
309+
310+
// =============================================================================
311+
276312
// tag::fleet-server-es-ca-trusted-fingerprint[]
277313
|
278314
[id="env-{type}-fleet-server-es-ca-trusted-fingerprint"]
@@ -288,6 +324,32 @@ by {agent} for communication. This flag is required when using self-signed certi
288324
289325
// =============================================================================
290326
327+
// tag::fleet-server-es-cert[]
328+
|
329+
[id="env-{type}-fleet-server-es-cert"]
330+
`FLEET_SERVER_ES_CERT`
331+
332+
| (string) The path to the mutual TLS client certificate that that {fleet-server} will use to connect to {es}.
333+
334+
*Default:* `""`
335+
336+
// end::fleet-server-es-cert[]
337+
338+
// =============================================================================
339+
340+
// tag::fleet-server-es-cert-key[]
341+
|
342+
[id="env-{type}-fleet-server-es-cert-key"]
343+
`FLEET_SERVER_ES_CERT_KEY`
344+
345+
| (string) The path to the mutual TLS private key that that {fleet-server} will use to connect to {es}.
346+
347+
*Default:* `""`
348+
349+
// end::fleet-server-es-cert-key[]
350+
351+
// =============================================================================
352+
291353
// tag::fleet-enroll[]
292354
|
293355
[id="env-{type}-fleet-enroll"]

0 commit comments

Comments
 (0)