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

Only applies entry limits to non-SampleExprs. #2850

Merged
merged 2 commits into from
Nov 4, 2020

Conversation

owen-d
Copy link
Member

@owen-d owen-d commented Oct 29, 2020

Two issues:

  1. The docs were incorrect for -validation.max-entries-limit. 0 does not mean disabled.
  2. We were incorrectly validating against the API limit param on metric queries. This didn't make sense so I've added a check and avoided this case.

@codecov-io
Copy link

Codecov Report

Merging #2850 into master will decrease coverage by 0.09%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2850      +/-   ##
==========================================
- Coverage   61.37%   61.28%   -0.10%     
==========================================
  Files         179      179              
  Lines       14438    14443       +5     
==========================================
- Hits         8862     8851      -11     
- Misses       4766     4780      +14     
- Partials      810      812       +2     
Impacted Files Coverage Δ
pkg/querier/http.go 0.00% <0.00%> (ø)
pkg/promtail/positions/positions.go 46.80% <0.00%> (-11.71%) ⬇️
pkg/storage/stores/shipper/uploads/table.go 68.66% <0.00%> (-1.85%) ⬇️
...kg/storage/stores/shipper/uploads/table_manager.go 65.78% <0.00%> (-1.76%) ⬇️
pkg/canary/comparator/comparator.go 78.18% <0.00%> (+1.81%) ⬆️
pkg/querier/queryrange/downstreamer.go 97.64% <0.00%> (+2.35%) ⬆️

@@ -1598,7 +1598,7 @@ logs in Loki.
# CLI flag: -distributor.max-line-size
[max_line_size: <string> | default = none ]

# Maximum number of log entries that will be returned for a query. 0 to disable.
# Maximum number of log entries that will be returned for a query.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# Maximum number of log entries that will be returned for a query.
# Maximum number of log entries that returned for a query.

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
Copy link
Contributor

I don't think it's related to #2863

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.

4 participants