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 Nolabels parse metrics #863

Merged
merged 1 commit into from
Aug 9, 2019
Merged

Conversation

adityacs
Copy link
Collaborator

@adityacs adityacs commented Aug 7, 2019

What this PR does / why we need it:
Fixes tailing with no labels
Which issue(s) this PR fixes:
Fixes #765

@adityacs
Copy link
Collaborator Author

adityacs commented Aug 7, 2019

@sandlis Kindly review this

@sandeepsukhani
Copy link
Contributor

@adityacs I just saw your PR while I was going to open one with my fix.
Please check out how I fixed it which I feel would be good to go with instead of checking no labels flag at 2 places and recreating labels instance for each logline. sandeepsukhani@1d1c327

I do not mind if you want to copy all of the changes from my branch and improve it further since you got to open the PR first.
Thanks for the PR!

@adityacs
Copy link
Collaborator Author

adityacs commented Aug 7, 2019

@sandlis Thanks for considering my code change. However, your code is elegant. Kindly close this PR and push your changes.

Sorry for hijacking your task 😄

@sandeepsukhani
Copy link
Contributor

@adityacs It is not a problem. Since you started working on it first, I would encourage you to go ahead with this instead. We appreciate and encourage more people to contribute to Loki.
Please let me know if you need any help with this from my side.

@adityacs
Copy link
Collaborator Author

adityacs commented Aug 8, 2019

@sandlis Very encouraging attitude. Thanks a lot 😄

@adityacs
Copy link
Collaborator Author

adityacs commented Aug 8, 2019

@sandlis I have copied the code from your branch and pushed the changes. Kindly review

Copy link
Contributor

@sandeepsukhani sandeepsukhani left a comment

Choose a reason for hiding this comment

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

LGTM

@sandeepsukhani sandeepsukhani merged commit 1329890 into grafana:master Aug 9, 2019
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.

logcli query: using --no-labels and --tail together results in error
2 participants