Make Elasticsearch JSON logs ECS compliant #47105
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
|
Pinging @elastic/es-core-infra |
|
@elasticmachine update branch |
|
merge conflict between base and head |
|
ok to test |
within nonEmpty fixing diewithdignity so that pattern does not rely on order and package name adding ES_LOG_LINE parser so this functionality can be tested in JsonThrowablePatternConverterTests
cutom logging config it test to look for [\w-]
pugnascotia
reviewed
Mar 26, 2020
qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java
Outdated
Show resolved
Hide resolved
pugnascotia
reviewed
Mar 26, 2020
| @Plugin(name = "ESJsonLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true) | ||
| public class ESJsonLayout extends AbstractStringLayout { | ||
|
|
||
| private final PatternLayout patternLayout; | ||
| private String overridenFields; | ||
| private String esmessagefields; |
There was a problem hiding this comment.
Camel-case, perhaps?
Suggested change
| private String esmessagefields; | |
| private String esMessageFields; |
There was a problem hiding this comment.
I made this lowercase because a key in a property file is lowercase. Do you think it makes sense to keep it lowercase only because of this? Or camel-case is better?
…ts.java Co-Authored-By: Rory Hunter <pugnascotia@users.noreply.github.com>
…ch into feature/ecs-log-lib
pugnascotia
reviewed
Mar 27, 2020
build.gradle
Outdated
| @@ -118,6 +118,9 @@ subprojects { | |||
| ':distribution:tools:plugin-cli', | |||
| ':qa:os', | |||
| ':qa:wildfly', | |||
| ':qa:die-with-dignity', | |||
| ':qa:logging-config', | |||
| ':qa:evil-tests', | |||
There was a problem hiding this comment.
I've changed this to an opt-out list in gradle/formatting.gradle, so you should remove these project paths from the list in that file.
|
@elasticmachine run elasticsearch-ci/bwc |
This was referenced Apr 14, 2020
This was referenced Apr 20, 2020
This was referenced May 18, 2021
pgomulka
added a commit
that referenced
this pull request
Oct 20, 2021
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.
Updating log4j2 configuration to use
EcsLayoutfor our JSON logs https://github.com/elastic/ecs-logging-java instead of previously usedESJsonLayoutWe still test against 7.x
ESJsonLayoutto make sure users won't break because of this change. Because of this the previous infrastructure still stays.This might be worth discussing if we can break them with this. I personally feel that introducing JSON in 7 and then breaking users in 8 might be annoying.
Notable differences compared to 7.x ES JSON:
tagsfield - previously markers were prefix in a message field%-25c{1.}for instanceo.e.n.Nodenode_and_cluster_idwhich not usable with ecs-java-layout libcloses #46119