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

Cortex update pre 1.7 #3215

Merged
merged 3 commits into from
Jan 26, 2021
Merged

Conversation

cyriltovena
Copy link
Contributor

What this PR does / why we need it:

This PR update Loki cortex dependency to pre-release 1.7.

Special notes for your reviewer:
I've update the ruler to use overrides and deprecated a configuration that now uses overrides.

Checklist

  • [ x ] Documentation added
  • [ x ] Tests updated

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

Looks like there's a bit of vendoring work for the tests to pass then LGTM


# Maximum number of rules per rule group per-tenant. 0 to disable.
# CLI flag: -ruler.max-rules-per-rule-group
[ruler_max_rules_per_rule_group: <int> | default = 0]
Copy link
Member

Choose a reason for hiding this comment

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

<3 yes

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
@cyriltovena cyriltovena merged commit 33abab5 into grafana:master Jan 26, 2021
cyriltovena pushed a commit to cyriltovena/loki that referenced this pull request Jun 11, 2021
DynamoDB can be used for storing either or both chunks and indexes.

This change improves the error messages in `BatchWrite()` method by using
`items` instead of `chunk` and also adds `DynamoDB` to the error message.

The previous error message was misleading as a failed index write can produce
an error message about chunks:
```
caller=flush.go:199 org_id=fake msg="failed to flush user"
err="failed to write chunk, 1 values remaining: context deadline exceeded"
```

Signed-off-by: Siavash Safi <siavash.safi@gmail.com>
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.

2 participants