Skip to content
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

Convert Filebeat kafka.* to ECS #9297

Merged
merged 4 commits into from
Dec 20, 2018
Merged

Convert Filebeat kafka.* to ECS #9297

merged 4 commits into from
Dec 20, 2018

Conversation

webmat
Copy link
Contributor

@webmat webmat commented Nov 29, 2018

Caveats

  • Module used to keep original message in message, and cleaned up message
    in kafka.log.message. Keeping original message will be addressed elsewhere,
    and this PR now replaces message with the cleaned up message.

Renames

  • kafka.log.level => log.level
  • kafka.log.message => message

TODO

  • Alias renamed fields to their ECS counterpart
  • Document field migrations in ecs-migration.yml
  • Changelog
  • Final rebase

Noticed

  • This module doesn't have a sample log that populates kafka.log.trace.full

@ruflin ruflin mentioned this pull request Nov 29, 2018
@webmat webmat self-assigned this Nov 29, 2018
@webmat webmat added in progress Pull request is currently in progress. module Filebeat Filebeat ecs labels Nov 29, 2018
@webmat webmat force-pushed the ecs-kafka-fb branch 2 times, most recently from cafba24 to f30da0d Compare December 19, 2018 18:29
@webmat webmat requested a review from a team as a code owner December 19, 2018 18:29
@webmat webmat added the review label Dec 19, 2018
@webmat webmat changed the title WIP Convert Filebeat kafka.* to ECS Convert Filebeat kafka.* to ECS Dec 19, 2018
@webmat webmat removed the in progress Pull request is currently in progress. label Dec 19, 2018
@@ -6,18 +6,18 @@
"field": "message",
"trace_match": true,
"patterns": [
"(?m)%{TIMESTAMP_ISO8601:kafka.log.timestamp}. %{LOGLEVEL:kafka.log.level} +%{JAVALOGMESSAGE:kafka.log.message} \\(%{JAVACLASS:kafka.log.class}\\)$[ \\n]*(?'kafka.log.trace.full'.*)"
"(?m)%{TIMESTAMP_ISO8601:kafka.log.timestamp}. %{LOGLEVEL:log.level} +%{JAVALOGMESSAGE:message} \\(%{JAVACLASS:kafka.log.class}\\)$[ \\n]*(?'kafka.log.trace.full'.*)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds like one day we should have something related to Java class.

@felixbarny Is there a standardised way Java APM agent is storing this info?

@@ -6,9 +6,8 @@
"input.type": "log",
"kafka.log.class": "state.change.logger",
"kafka.log.component": "Broker id=30",
"kafka.log.level": "TRACE",
"kafka.log.message": "Cached leader info PartitionState(controllerEpoch=25, leader=-1, leaderEpoch=15, isr=[10], zkVersion=15, replicas=[10], offlineReplicas=[10]) for partition __consumer_offsets-16 in response to UpdateMetadata request sent by controller 20 epoch 25 with correlation id 8",
"log.level": "TRACE",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a log level we haven't really used yet. No change needed.

@webmat webmat force-pushed the ecs-kafka-fb branch 2 times, most recently from baf3209 to 0b77277 Compare December 20, 2018 16:12
Mathieu Martin added 4 commits December 20, 2018 14:26
- kafka.log.level => log.level
- kafka.log.message => message
The pipeline ends with remove `remove field kafka.log.timestamp`.
@webmat webmat merged commit c053a32 into elastic:master Dec 20, 2018
@webmat webmat deleted the ecs-kafka-fb branch December 20, 2018 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants