-
Notifications
You must be signed in to change notification settings - Fork 541
docs: New APM configuration section #10790
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
1e988e0
commit one
bmorelli25 57000ac
move outputs to top-level
bmorelli25 d89e74f
finish moving all config stuff over
bmorelli25 772ba4b
cleanup
bmorelli25 7ba842b
Merge branch 'main' into ft-new-config
bmorelli25 8f22560
try to fix doc build
bmorelli25 72685b8
Merge branch 'ft-new-config' of https://github.com/bmorelli25/apm-ser…
bmorelli25 5892e6a
Merge branch 'main' of https://github.com/elastic/apm-server into ft-…
bmorelli25 7993180
Update docs/configure/instrumentation.asciidoc
bmorelli25 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| = Agent authorization | ||
|
|
||
| Agent authorization APM Server configuration options. | ||
|
|
||
| include::./tab-widgets/auth-config-widget.asciidoc[] |
20 changes: 1 addition & 19 deletions
20
...-from-beats/docs/shared-env-vars.asciidoc → docs/configure/env.asciidoc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,43 @@ | ||
| [[configuration-process]] | ||
| == General configuration options | ||
| = General configuration options | ||
|
|
||
| General APM Server configuration options. | ||
|
|
||
| include::./tab-widgets/general-config-widget.asciidoc[] | ||
|
|
||
| [float] | ||
| == Options | ||
|
|
||
| Host:: | ||
| Defines the host and port the server is listening on. | ||
| Use `"unix:/path/to.sock"` to listen on a Unix domain socket. | ||
| Default: `127.0.0.1:8200` | ||
| + | ||
| |==== | ||
| | APM Server binary | `apm-server.host` | ||
| | Fleet-managed | `Host` | ||
| |==== | ||
|
|
||
| URL:: | ||
| The publicly reachable server URL. For deployments on Elastic Cloud or ECK, the default is unchangeable. | ||
| + | ||
| |==== | ||
| | APM Server binary | N/A | ||
| | Fleet-managed | `URL` | ||
| |==== | ||
|
|
||
| Maximum request header:: | ||
| Maximum permitted size of a request's header accepted by the server to be processed (in Bytes). | ||
| + | ||
| |==== | ||
| | APM Server binary | `apm-server.max_header_size` | ||
| | Fleet-managed | `Maximum size of a request's header` | ||
| |==== | ||
|
|
||
bmorelli25 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| Example config file: | ||
|
|
||
|
|
@@ -31,64 +69,64 @@ output.elasticsearch: | |
|
|
||
| [float] | ||
| [[configuration-apm-server]] | ||
| === Configuration options: `apm-server.*` | ||
| == Configuration options: `apm-server.*` | ||
|
|
||
| [[host]] | ||
| [float] | ||
| ==== `host` | ||
| === `host` | ||
| Defines the host and port the server is listening on. | ||
| Use `"unix:/path/to.sock"` to listen on a Unix domain socket. | ||
| Defaults to 'localhost:8200'. | ||
|
|
||
| [[max_header_size]] | ||
| [float] | ||
| ==== `max_header_size` | ||
| === `max_header_size` | ||
| Maximum permitted size of a request's header accepted by the server to be processed (in Bytes). | ||
| Defaults to 1048576 Bytes (1 MB). | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
|
|
||
| [[idle_timeout]] | ||
| [float] | ||
| ==== `idle_timeout` | ||
| === `idle_timeout` | ||
| Maximum amount of time to wait for the next incoming request before underlying connection is closed. | ||
| Defaults to 45 seconds. | ||
|
|
||
| [[read_timeout]] | ||
| [float] | ||
| ==== `read_timeout` | ||
| === `read_timeout` | ||
| Maximum permitted duration for reading an entire request. | ||
| Defaults to 30 seconds. | ||
|
|
||
| [[write_timeout]] | ||
| [float] | ||
| ==== `write_timeout` | ||
| === `write_timeout` | ||
| Maximum permitted duration for writing a response. | ||
| Defaults to 30 seconds. | ||
|
|
||
| [[shutdown_timeout]] | ||
| [float] | ||
| ==== `shutdown_timeout` | ||
| === `shutdown_timeout` | ||
| Maximum duration in seconds before releasing resources when shutting down the server. | ||
| Defaults to 5 seconds. | ||
|
|
||
| [[max_event_size]] | ||
| [float] | ||
| ==== `max_event_size` | ||
| === `max_event_size` | ||
| Maximum permitted size of an event accepted by the server to be processed (in Bytes). | ||
| Defaults to 307200 Bytes. | ||
|
|
||
| [float] | ||
| [[configuration-other]] | ||
| === Configuration options: general | ||
| == Configuration options: general | ||
|
|
||
| [[max_connections]] | ||
| [float] | ||
| ==== `max_connections` | ||
| === `max_connections` | ||
| Maximum number of TCP connections to accept simultaneously. | ||
| Default value is 0, which means _unlimited_. | ||
|
|
||
| [[config-secret-token]] | ||
| [float] | ||
| ==== `auth.secret_token` | ||
| === `auth.secret_token` | ||
| Authorization token for sending data to the APM server. | ||
| If a token is set, the agents must send it in the following format: | ||
| Authorization: Bearer <secret-token>. | ||
|
|
@@ -99,7 +137,7 @@ Read more about <<securing-apm-server, Securing APM Server>> and the <<secret-to | |
|
|
||
| [[config-secret-token-legacy]] | ||
| [float] | ||
| ==== `secret_token` | ||
| === `secret_token` | ||
|
|
||
| deprecated::[7.14.0, Replaced by `auth.secret_token`. See <<config-secret-token>>] | ||
|
|
||
|
|
@@ -108,70 +146,70 @@ The old configuration will continue to work until 8.0.0, and the new configurati | |
|
|
||
| [[capture_personal_data]] | ||
| [float] | ||
| ==== `capture_personal_data` | ||
| === `capture_personal_data` | ||
| If true, | ||
| APM Server captures the IP of the instrumented service and its User Agent if any. | ||
| Enabled by default. | ||
|
|
||
| [[default_service_environment]] | ||
| [float] | ||
| ==== `default_service_environment` | ||
| === `default_service_environment` | ||
| Sets the default service environment to associate with data and requests received from agents which have no service environment defined. | ||
|
|
||
| [[expvar.enabled]] | ||
| [float] | ||
| ==== `expvar.enabled` | ||
| === `expvar.enabled` | ||
| When set to true APM Server exposes https://golang.org/pkg/expvar/[golang expvar]. | ||
| Disabled by default. | ||
|
|
||
| [[expvar.url]] | ||
| [float] | ||
| ==== `expvar.url` | ||
| === `expvar.url` | ||
| Configure the URL to expose expvar. | ||
| Defaults to `debug/vars`. | ||
|
|
||
| [[instrumentation.enabled]] | ||
| [float] | ||
| ==== `instrumentation.enabled` | ||
| === `instrumentation.enabled` | ||
| Enables self instrumentation of the APM Server itself. | ||
| Disabled by default. | ||
|
|
||
| [float] | ||
| [[configuration-tbs]] | ||
| === Configuration options: tail-based sampling | ||
| == Configuration options: tail-based sampling | ||
|
|
||
| [[sampling.tail.enabled]] | ||
| [float] | ||
| ==== `sampling.tail.enabled` | ||
| === `sampling.tail.enabled` | ||
| Set to `true` to enable tail based sampling. | ||
| Disabled by default. | ||
|
|
||
| [[sampling.tail.interval]] | ||
| [float] | ||
| ==== `sampling.tail.interval` | ||
| === `sampling.tail.interval` | ||
| Synchronization interval for multiple APM Servers. | ||
| Should be in the order of tens of seconds or low minutes. | ||
|
|
||
| [[sampling.tail.policies]] | ||
| [float] | ||
| ==== `sampling.tail.policies` | ||
| === `sampling.tail.policies` | ||
| Criteria used to match a root transaction to a sample rate. | ||
|
|
||
| [float] | ||
| === Configuration options: `max_procs` | ||
| == Configuration options: `max_procs` | ||
|
|
||
| [[max_procs]] | ||
| [float] | ||
| ==== `max_procs` | ||
| === `max_procs` | ||
| Sets the maximum number of CPUs that can be executing simultaneously. | ||
| The default is the number of logical CPUs available in the system. | ||
|
|
||
| [float] | ||
| === Configuration options: `data_streams` | ||
| == Configuration options: `data_streams` | ||
|
|
||
| [[data_streams.wait_for_integration]] | ||
| [float] | ||
| ==== `wait_for_integration` | ||
| === `wait_for_integration` | ||
| Wait for the `apm` {fleet} integration to be installed by {kib}. Requires either <<kibana-enabled>> | ||
| or for the <<elasticsearch-output, {es} output>> to be configured. | ||
| Defaults to true. | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note on content: we should add that the
URLis purely informational, and has no effect on where the server is reachable. For changing where the server is listening, theHostneeds to be configured.@bmorelli25 totally up to you if you want to add this here or in a follow up PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed offline with Silvia on 10/05/23, I'll address this and all other feedback in the follow-up PR.