Skip to content

Commit 17166cd

Browse files
simittsimitt
authored
[fleet integration] Support apm-server config options and adapt defaults. (#5444)
* Add missing settings that should be supported for APM Server Integration. * Adapt default values to be aligned with cloud values where possible. closes #4528
1 parent 7b86cb7 commit 17166cd

3 files changed

Lines changed: 133 additions & 19 deletions

File tree

‎apmpackage/apm/agent/input/template.yml.hbs‎

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,56 @@
11
apm-server:
2-
host: {{host}}
3-
auth:
4-
secret_token: {{secret_token}}
5-
api_key:
6-
enabled: {{api_key_enabled}}
7-
limit: {{api_key_limit}}
8-
max_event_size: {{max_event_bytes}}
2+
api_key:
3+
enabled: {{api_key_enabled}}
4+
limit: {{api_key_limit}}
95
capture_personal_data: {{capture_personal_data}}
6+
idle_timeout: {{idle_timeout}}
107
default_service_environment: {{default_service_environment}}
8+
expvar.enabled: {{expvar_enabled}}
9+
host: {{host}}
10+
max_connections: {{max_connections}}
11+
max_event_size: {{max_event_bytes}}
12+
max_header_size: {{max_header_bytes}}
13+
read_timeout: {{read_timeout}}
14+
response_headers: {{response_headers}}
1115
rum:
12-
enabled: {{enable_rum}}
13-
source_mapping.elasticsearch.api_key: {{sourcemap_api_key}}
14-
allow_service_names:
15-
{{#each rum_allow_service_names}}
16+
allow_headers:
17+
{{#each rum_allow_headers}}
1618
- {{this}}
1719
{{/each}}
1820
allow_origins:
1921
{{#each rum_allow_origins}}
2022
- {{this}}
2123
{{/each}}
22-
allow_headers:
23-
{{#each rum_allow_headers}}
24+
allow_service_names:
25+
{{#each rum_allow_service_names}}
2426
- {{this}}
2527
{{/each}}
26-
library_pattern: {{rum_library_pattern}}
27-
exclude_from_grouping: {{rum_exclude_from_grouping}}
28-
response_headers: {{rum_response_headers}}
28+
enabled: {{enable_rum}}
2929
event_rate.limit: {{rum_event_rate_limit}}
3030
event_rate.lru_size: {{rum_event_rate_lru_size}}
31+
exclude_from_grouping: {{rum_exclude_from_grouping}}
32+
library_pattern: {{rum_library_pattern}}
33+
response_headers: {{rum_response_headers}}
34+
source_mapping.elasticsearch.api_key: {{sourcemap_api_key}}
35+
secret_token: {{secret_token}}
36+
shutdown_timeout: {{shutdown_timeout}}
37+
{{#if tls_enabled}}
38+
ssl:
39+
enabled: {{tls_enabled}}
40+
certificate: {{tls_certificate}}
41+
key: {{tls_key}}
42+
key_passphrase: {{tls_key_passphrase}}
43+
supported_protocols: {{tls_supported_protocols}}
44+
{{#each tls_supported_protocols}}
45+
- {{this}}
46+
{{/each}}
47+
cipher_suites: {{tls_cipher_suites}}
48+
{{#each tls_cipher_suites}}
49+
- {{this}}
50+
{{/each}}
51+
curve_types: {{tls_curve_types}}
52+
{{#each tls_curve_types}}
53+
- {{this}}
54+
{{/each}}
55+
{{/if}}
56+
write_timeout: {{write_timeout}}

‎apmpackage/apm/manifest.yml‎

Lines changed: 90 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ policy_templates:
7171
description: Enable Real User Monitoring (RUM).
7272
required: true
7373
show_user: true
74-
default: false
74+
default: true
7575
- name: default_service_environment
7676
type: text
7777
title: Default Service Environment
@@ -112,14 +112,14 @@ policy_templates:
112112
description: Maximum number of events allowed per IP per second.
113113
required: false
114114
show_user: false
115-
default: 300
115+
default: 10
116116
- name: rum_event_rate_lru_size
117117
type: integer
118118
title: RUM - Rate limit cache size
119119
description: Number of unique IPs to be cached for the rate limiter.
120120
required: false
121121
show_user: false
122-
default: 1000
122+
default: 10000
123123
- name: sourcemap_api_key
124124
type: text
125125
title: RUM - API Key for Sourcemaps
@@ -146,6 +146,93 @@ policy_templates:
146146
required: false
147147
show_user: false
148148
default: true
149+
- name: max_header_bytes
150+
type: integer
151+
title: Maximum size of a request's header (bytes)
152+
required: false
153+
show_user: false
154+
default: 1048576
155+
- name: idle_timeout
156+
type: text
157+
title: Idle time before underlying connection is closed
158+
required: false
159+
show_user: false
160+
default: "45s"
161+
- name: read_timeout
162+
type: text
163+
title: Maximum duration for reading an entire request
164+
required: false
165+
show_user: false
166+
default: "3600s"
167+
- name: shutdown_timeout
168+
type: text
169+
title: Maximum duration before releasing resources when shutting down
170+
required: false
171+
show_user: false
172+
default: "30s"
173+
- name: write_timeout
174+
type: text
175+
title: Maximum duration for writing a response
176+
required: false
177+
show_user: false
178+
default: "30s"
179+
- name: max_connections
180+
type: integer
181+
title: Simultaneously accepted connections
182+
description: 0 for unlimited
183+
required: false
184+
show_user: false
185+
default: 0
186+
- name: response_headers
187+
type: yaml
188+
title: Custom HTTP headers added to HTTP responses
189+
description: Might be used for security policy compliance.
190+
required: false
191+
show_user: false
192+
- name: expvar_enabled
193+
type: bool
194+
title: Enable APM Server Golang expvar support
195+
description: exposed under /debug/vars
196+
required: false
197+
show_user: false
198+
default: false
199+
- name: tls_enabled
200+
type: bool
201+
title: Enable TLS
202+
required: false
203+
show_user: false
204+
default: false
205+
- name: tls_certificate
206+
type: text
207+
title: File path to server certificate
208+
description: Required when TLS is enabled.
209+
required: false
210+
show_user: false
211+
- name: tls_key
212+
type: text
213+
title: File path to server certificate key
214+
description: Required when TLS is enabled.
215+
required: false
216+
show_user: false
217+
- name: tls_supported_protocols
218+
type: text
219+
multi: true
220+
title: Supported protocol versions
221+
required: false
222+
show_user: false
223+
- name: tls_cipher_suites
224+
type: text
225+
multi: true
226+
title: Cipher suites for TLS connections.
227+
description: Not configurable for TLS 1.3.
228+
required: false
229+
show_user: false
230+
- name: tls_curve_types
231+
type: text
232+
multi: true
233+
title: Curve types for ECDHE based cipher suites
234+
required: false
235+
show_user: false
149236
template_path: template.yml.hbs
150237
owner:
151238
github: elastic/apm-server

‎changelogs/head.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ https://github.com/elastic/apm-server/compare/7.13\...master[View commits]
3131
* Add support for OpenTelemetry labels describing mobile connectivity {pull}5436[5436]
3232
* Introduce `apm-server.auth.*` config {pull}5457[5457]
3333
* Add debug logging of OpenTelemetry payloads {pull}5474[5474]
34+
* Add support for more input variables in fleet integration {pull}5444[5444]
3435

3536
[float]
3637
==== Deprecated

0 commit comments

Comments
 (0)