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

Add alert relabelling for Thanos Rule based on Prometheus' logic #4125

Merged
merged 3 commits into from
May 14, 2021
Merged

Add alert relabelling for Thanos Rule based on Prometheus' logic #4125

merged 3 commits into from
May 14, 2021

Conversation

trutty
Copy link
Contributor

@trutty trutty commented Apr 30, 2021

Signed-off-by: Christian Schulz [email protected]

Fixes #4122

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

Add Prometheus' alert relabelling features to Thanos Rule.
Add command line flag to supply the configuration via YAML or file.

Verification

Tested locally with a unit test.
The relabelling logic itself is also tested within Prometheus.

@trutty
Copy link
Contributor Author

trutty commented May 7, 2021

All checks have passed. Would someone care for a review? ;) @yeya24 maybe?

yeya24
yeya24 previously approved these changes May 10, 2021
Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

LGTM! Perfect work. Only some nits about import.

cmd/thanos/rule.go Outdated Show resolved Hide resolved
pkg/alert/alert.go Outdated Show resolved Hide resolved
pkg/alert/alert_test.go Show resolved Hide resolved
pkg/alert/config.go Outdated Show resolved Hide resolved
Christian Schulz and others added 3 commits May 12, 2021 19:10
@trutty
Copy link
Contributor Author

trutty commented May 12, 2021

LGTM! Perfect work. Only some nits about import.

Thanks for your review @yeya24. I resolved your comments, rebased again on main and committed the grouped imports (make format did not group them initially because the imports where on a separate block).

Unfortunately there seem to be some flaky unit tests and e2e tests, that are unrelated to my changes. Could you restart the build by any chance?

@trutty trutty requested a review from yeya24 May 14, 2021 13:11
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

Looks solid. Thank you!

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.

Alert relabelling for Thanos Rule
3 participants