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

Fix blank messages in CRI & support CRI in Helm #371

Merged
merged 3 commits into from
Mar 6, 2019

Conversation

steven-sheehy
Copy link
Contributor

@steven-sheehy steven-sheehy commented Mar 5, 2019

Follow up to #365.

  • Fix blank messages showing up as an error 'Line did not match the CRI log format'. CRI splits lines that contain newlines as multiple logging lines, so if application adds blank lines for spacing then these were ignored. For example, my app starts up and prints a multi-line ascii banner with some empty lines around it.
  • Add an option to set the entryParser in the promtail configMap so helm users can switch from docker (default) to cri.
  • Fix fullnameOverride not properly namespaced in Helm chart. Previously it assumed both sub-charts would have the same fullname.
  • Bumped the Helm chart version for new features as is recommended

@steven-sheehy
Copy link
Contributor Author

/cc @slim-bean

@steven-sheehy steven-sheehy changed the title Cri fixes Fix blank messages in CRI & support CRI in Helm Mar 5, 2019
@tomwilkie tomwilkie requested a review from slim-bean March 6, 2019 11:27
@slim-bean
Copy link
Collaborator

@steven-sheehy could you rebase this on master, I reorganized the test file you created a little to add some docker test coverage, but hopefully the merge isn't too bad.

Steven Sheehy added 3 commits March 6, 2019 09:23
@steven-sheehy
Copy link
Contributor Author

@slim-bean Done

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

I'm new to Helm so took me a bit to understand things.

Thanks for the contributions @steven-sheehy!

@slim-bean slim-bean merged commit 067c5af into grafana:master Mar 6, 2019
@slim-bean
Copy link
Collaborator

and thanks for the detailed PR notes :)

@steven-sheehy steven-sheehy deleted the cri-fixes branch March 31, 2019 00:30
periklis added a commit to periklis/loki that referenced this pull request Oct 21, 2024
periklis added a commit to periklis/loki that referenced this pull request Oct 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants