-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
release-21.2: log: add support for decoding JSON logs #83147
release-21.2: log: add support for decoding JSON logs #83147
Conversation
Thanks for opening a backport. Please check the backport criteria before merging:
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
Add a brief release justification to the body of your PR to justify this backport. Some other things to consider:
|
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.
Looks good, aside from one detail that I wasn't sure about.
Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @abarganier and @dhartunian)
pkg/util/log/log_decoder.go
line 140 at r1 (raw file):
return "crdb-v2", nil }
Do we want a match against v1IndicatorRE
here as well? I noticed that it's done in the original PR.
491b94c
to
ce4f99a
Compare
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.
Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @abarganier)
pkg/util/log/log_decoder.go
line 140 at r1 (raw file):
Previously, abarganier (Alex Barganier) wrote…
Do we want a match against
v1IndicatorRE
here as well? I noticed that it's done in the original PR.
fixed. good catch. must have gotten lost in the merge conflict resolution.
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.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @abarganier)
Realized the test failures and merge confusion was because there's a prior backport missing: #83748 will wait for that to merge. |
Previously, our logging code did not have the ability to recognize and decode JSON formatted log files. This led to problems when retrieving logs via API endpoints and when running commands such as `merge-logs` to process logs from debug.zip files. This commit adds support for the json, json-compact, json-fluent, and json-fluent-compact formats via one generalized JSON decoder. Resolves cockroachdb#66684 Release note (ops change, cli change): debug zip and merge-logs commands will now work with JSON formatted logs.
ce4f99a
to
29d22b7
Compare
Backport 1/1 commits from #79356.
/cc @cockroachdb/release
Previously, our logging code did not have the ability to recognize and
decode JSON formatted log files. This led to problems when retrieving
logs via API endpoints and when running commands such as
merge-logs
toprocess logs from debug.zip files.
This commit adds support for the json, json-compact, json-fluent, and
json-fluent-compact formats via one generalized JSON decoder.
Resolves #66684
Release note (ops change, cli change): debug zip and merge-logs commands
will now work with JSON formatted logs.
Jira issue: CRDB-14742
Release justification: high-need log management change that's additive to existing log parsing