Doc clarifications #2032
Merged
Doc clarifications #2032
Conversation
This file contains 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
graphaelli
reviewed
Mar 21, 2019
_meta/beat.yml
Outdated
| @@ -188,7 +188,7 @@ apm-server: | |||
| #setup.template.name: "apm-%{[observer.version]}" | |||
|
|
|||
| # Template pattern. By default the template pattern is "apm-%{[observer.version]}-*" to apply to the default index settings. | |||
| # The first part is the version of the beat and then -* is used to match all daily indices. | |||
| # The first part is the version of the apm-server and then -* is used to match all daily indices. | |||
_meta/beat.yml
Outdated
| @@ -230,7 +230,7 @@ apm-server: | |||
|
|
|||
| #================================ Outputs ===================================== | |||
|
|
|||
| # Configure what output to use when sending the data collected by the beat. | |||
| # Configure what output to use when sending the data collected by the apm-server. | |||
| @@ -29,7 +29,7 @@ apm-server: | |||
| # Authorization token to be checked. If a token is set here the agents must | |||
| # send their token in the following format: Authorization: Bearer <secret-token>. | |||
| # It is recommended to use an authorization token in combination with SSL enabled, | |||
| # and save the token in the beats keystore. | |||
| # and save the token in the apm-server keystore. | |||
jalvz
force-pushed
the
doc-clarifications
branch
from
063b982 to
f09c58d
Compare
jalvz
force-pushed
the
doc-clarifications
branch
from
f09c58d to
78c0e2b
Compare
graphaelli
approved these changes
Mar 22, 2019
jalvz
added a commit
to jalvz/apm-server
that referenced
this pull request
Mar 25, 2019
* setup with extra args doesn't setup pipelines * remove some confusing beats references from apm-server.yml
jalvz
added a commit
to jalvz/apm-server
that referenced
this pull request
Mar 25, 2019
* setup with extra args doesn't setup pipelines * remove some confusing beats references from apm-server.yml
jalvz
added a commit
that referenced
this pull request
Mar 25, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #2016
also part of #2026