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

logcli: support --include-label when not using --tail #3229

Merged
merged 1 commit into from
Jan 27, 2021
Merged

logcli: support --include-label when not using --tail #3229

merged 1 commit into from
Jan 27, 2021

Conversation

dethi
Copy link
Contributor

@dethi dethi commented Jan 25, 2021

What this PR does / why we need it:

logcli currently only supports --include-label in combination with --tail. This seems like a bug to me since --exclude-label is supported with or without --tail.

This PR adds support for --include-label inside printStream(), which fix the issue.

Which issue(s) this PR fixes: N/A

Special notes for your reviewer: N/A

Checklist

  • Documentation added
  • Tests updated

@CLAassistant
Copy link

CLAassistant commented Jan 25, 2021

CLA assistant check
All committers have signed the CLA.

@codecov-io
Copy link

Codecov Report

Merging #3229 (8dde30c) into master (0208071) will decrease coverage by 0.10%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3229      +/-   ##
==========================================
- Coverage   63.20%   63.10%   -0.11%     
==========================================
  Files         197      197              
  Lines       16685    16689       +4     
==========================================
- Hits        10546    10531      -15     
- Misses       5184     5200      +16     
- Partials      955      958       +3     
Impacted Files Coverage Δ
pkg/logcli/query/query.go 34.80% <0.00%> (-0.79%) ⬇️
pkg/logql/vector.go 59.09% <0.00%> (-22.73%) ⬇️
pkg/querier/queryrange/limits.go 91.66% <0.00%> (-4.17%) ⬇️
pkg/querier/queryrange/downstreamer.go 95.29% <0.00%> (-2.36%) ⬇️
pkg/canary/comparator/comparator.go 76.36% <0.00%> (-1.82%) ⬇️
pkg/logql/evaluator.go 89.87% <0.00%> (-0.36%) ⬇️

Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

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

LGTM

@cyriltovena cyriltovena merged commit 2bbf4b2 into grafana:master Jan 27, 2021
@cyriltovena
Copy link
Contributor

Thank you !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants