docs: Update documentation copied from Beats #3793
Merged
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
bmorelli25
commented
May 13, 2020
Comment on lines
+238
to
+243
| [float] | ||
| ==== `logging.ecs` | ||
|
|
||
| When true, logs messages with minimal required Elastic Common Schema (ECS) | ||
| information. | ||
|
|
There was a problem hiding this comment.
#3749 was merged into 7.x, not master. Is this ok to have in master?
There was a problem hiding this comment.
yes it is, sorry I forgot to follow up with it in master.
Codecov Report
@@ Coverage Diff @@
## master #3793 +/- ##
=======================================
Coverage 79.84% 79.84%
=======================================
Files 136 136
Lines 6158 6158
=======================================
Hits 4917 4917
Misses 1241 1241 |
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
|
axw
approved these changes
May 14, 2020
bmorelli25
added a commit
to bmorelli25/apm-server
that referenced
this pull request
May 14, 2020
# Conflicts: # docs/copied-from-beats/docs/loggingconfig.asciidoc
bmorelli25
added a commit
to bmorelli25/apm-server
that referenced
this pull request
May 14, 2020
# Conflicts: # docs/copied-from-beats/docs/loggingconfig.asciidoc
bmorelli25
added a commit
that referenced
this pull request
May 19, 2020
bmorelli25
added a commit
that referenced
this pull request
May 19, 2020
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.
Motivation/summary
This PR updates the shared Beats documentation. It also adds documentation for Kerberos, including proposed changes to APM Server's yml config files in 1cb76a6. Based on elastic/beats#16871 and elastic/beats#17927, kerberos settings have been added to the Elasticsearch output, Kafka output, and X-pack Monitoring sections of those files.
Related issues
For https://github.com/elastic/observability-dev/issues/833.