Loki: Improve logging and add metrics to streams dropped by stream limit #2012
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…g a stream limit. Increment the dropped samples metrics when this happens also. Signed-off-by: Ed Welch <edward.welch@grafana.com>
slim-bean
force-pushed
the
rework-limit-log-metric
branch
from
ee0b652
to
0218149
Compare
cyriltovena
approved these changes
Apr 29, 2020
pkg/util/validation/validate.go
Outdated
| @@ -10,6 +10,8 @@ const ( | |||
| RateLimited = "rate_limited" | |||
| // LineTooLong is a reason for discarding too long log lines. | |||
| LineTooLong = "line_too_long" | |||
| // StreamLimit is a reason for discarding lines when we can't create any new streams | |||
There was a problem hiding this comment.
Suggested change
| // StreamLimit is a reason for discarding lines when we can't create any new streams | |
| // StreamLimit is a reason for discarding lines when we can't create many new streams |
pkg/ingester/limiter.go
Outdated
| localLimit = l.minNonZero(localLimit, l.convertGlobalToLocalLimit(globalLimit)) | ||
| adjustedGlobalLimit := l.convertGlobalToLocalLimit(globalLimit) | ||
|
|
||
| // Set the calculated limit to the lessor of the local limit or the new adjusted global limit |
There was a problem hiding this comment.
Suggested change
| // Set the calculated limit to the lessor of the local limit or the new adjusted global limit | |
| // Set the calculated limit to the less or of the local limit or the new adjusted global limit |
Signed-off-by: Ed Welch <edward.welch@grafana.com>
slim-bean
added a commit
that referenced
this pull request
Apr 30, 2020
…mit (#2012) * Improve the log message when we drop streams because a user is hitting a stream limit. Increment the dropped samples metrics when this happens also. Signed-off-by: Ed Welch <edward.welch@grafana.com> * improving comments Signed-off-by: Ed Welch <edward.welch@grafana.com> (cherry picked from commit 0ab1b28)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I combined the two unit tests for the limiter into one and used the new more verbose error message to assert the output of the previous helper function.
Signed-off-by: Ed Welch edward.welch@grafana.com