Skip to content

feat(envoy): json logging support #34323

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 21, 2024
Merged

feat(envoy): json logging support #34323

merged 1 commit into from
Oct 21, 2024

Conversation

byxorna
Copy link
Contributor

@byxorna byxorna commented Aug 12, 2024

description

This PR adds support to the helm chart to configure envoy with JSON logging via bootstrap.json, if envoy.log.format_json is provided. This is an alternative to envoy.log.format.

I took the opportunity to remove --log-format flag from the daemonset, and moved it into the bootstrap config at application_log_config.log_format.text_format in order to keep sprawl to a minimum. This change is backwards compatible.

See upstream docs for envoy application_log_config

checklist

  • For first time contributors, read Submitting a pull request
  • All code is covered by unit and/or runtime tests where feasible.
  • All commits contain a well written commit description including a title,
    description and a Fixes: #XXX line if the commit addresses a particular
    GitHub issue.
  • If your commit description contains a Fixes: <commit-id> tag, then
    please add the commit author[s] as reviewer[s] to this issue.
  • All commits are signed off. See the section Developer’s Certificate of Origin
  • Provide a title or release-note blurb suitable for the release notes.
  • Are you a user of Cilium? Please add yourself to the Users doc
  • Thanks for contributing!

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 12, 2024
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Aug 12, 2024
@byxorna byxorna force-pushed the byxorna/envoy-json-logging branch from b65155b to c327b2c Compare August 12, 2024 20:17
@byxorna byxorna marked this pull request as ready for review August 12, 2024 21:20
@byxorna byxorna requested review from a team as code owners August 12, 2024 21:20
@byxorna byxorna requested review from squeed and sayboras August 12, 2024 21:20
@byxorna byxorna force-pushed the byxorna/envoy-json-logging branch from c327b2c to fd54b00 Compare August 13, 2024 14:15
@joestringer joestringer added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Aug 14, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 14, 2024
@byxorna byxorna requested a review from squeed August 19, 2024 14:45
@ldelossa ldelossa added the area/helm Impacts helm charts and user deployment experience label Aug 21, 2024
@squeed
Copy link
Contributor

squeed commented Aug 22, 2024

/test

@squeed
Copy link
Contributor

squeed commented Aug 26, 2024

Looks reasonable to me. I'll let @sayboras comment from the Envoy side.

@sayboras
Copy link
Member

/test

@sayboras sayboras force-pushed the byxorna/envoy-json-logging branch from fd54b00 to d1acda4 Compare August 27, 2024 13:21
sayboras
sayboras reviewed Aug 27, 2024
View reviewed changes
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

The changes look reasonable to me. Can you split the changes for USERS.md to another PR?

@byxorna byxorna force-pushed the byxorna/envoy-json-logging branch from d1acda4 to c0a75d6 Compare August 28, 2024 15:45
@byxorna byxorna mentioned this pull request Aug 28, 2024
Merged
8 tasks
@byxorna byxorna requested a review from sayboras August 28, 2024 16:51
sayboras
sayboras approved these changes Aug 29, 2024
View reviewed changes
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

Thanks and lgtm ✔️

@sayboras
Copy link
Member

/test

@byxorna
Copy link
Contributor Author

byxorna commented Sep 18, 2024

@sayboras @squeed 👋🏽 - how can i assist to get this PR merged? Looks like there are some unrelated CI failures (ccache missing from some jobs?), not sure if those are blockers. Thanks! 😄

@julianwiedmann
Copy link
Member

@byxorna please don't merge the main branch into your PR. Just rebase instead :).

@byxorna byxorna force-pushed the byxorna/envoy-json-logging branch from 43af754 to 436ab97 Compare October 1, 2024 18:16
@byxorna
Copy link
Contributor Author

byxorna commented Oct 1, 2024

@byxorna please don't merge the main branch into your PR. Just rebase instead :).

Sorry about that! i just rebased and pushed, will do that next time

@julianwiedmann
Copy link
Member

/test

@julianwiedmann julianwiedmann removed the request for review from a team October 4, 2024 14:43
@julianwiedmann
Copy link
Member

@squeed sorry, this still needs a review for your codeowners.

@byxorna @aanm
feat(envoy): json logging support
9d0c61c 
Signed-off-by: Gabe Conradi <gconradi@seatgeek.com>
@aanm aanm force-pushed the byxorna/envoy-json-logging branch from 436ab97 to 9d0c61c Compare October 11, 2024 09:57
@aanm aanm enabled auto-merge October 11, 2024 09:57
@aanm
Copy link
Member

aanm commented Oct 11, 2024

/test

@aanm aanm added this pull request to the merge queue Oct 21, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 21, 2024
Merged via the queue into cilium:main with commit 4607afb Oct 21, 2024
63 checks passed
@lucasfcnunes lucasfcnunes mentioned this pull request Feb 3, 2025
Open
@mhofstetter mhofstetter mentioned this pull request Feb 17, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@squeed squeed squeed approved these changes

@sayboras sayboras sayboras approved these changes

Assignees
No one assigned
Labels
area/helm Impacts helm charts and user deployment experience kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@byxorna @squeed @sayboras @julianwiedmann @aanm @joestringer @ldelossa