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

pkg/rule: support identical rule filenames in different directories #1791

Merged
merged 1 commit into from Nov 26, 2019

Conversation

simonpasquier
Copy link
Contributor

@simonpasquier simonpasquier commented Nov 26, 2019

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

Changes

Thanos didn't deal correctly with rule files that have the same name but live in different directories (eg thanos rule --rule-file foo/rules.yml --rule-file bar/rules.yml). This is because the "transofrmed" files are stored in the same output directory and the filenames don't differ if the partial response strategy is the same.

Verification

Unit test added.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
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.

Nicely spotted 👍

LGTM

@bwplotka bwplotka merged commit 96c3657 into thanos-io:master Nov 26, 2019
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.

None yet

2 participants