pkg/rule: retain original path for rule files #1785
Merged
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
This change ensures that the /api/v1/rules endpoint returns the original path of the rule file instead of the path of the temporary file generated by Thanos ruler. Signed-off-by: Simon Pasquier <[email protected]>
simonpasquier
force-pushed
the
fix-rule-filenames
branch
from
3d7fa48
to
f28ad57
Compare
|
The CI failure doesn't seem to be related to the change. |
bwplotka
approved these changes
Nov 25, 2019
| } | ||
|
|
||
| func ruleWithDir(http, grpc address, dir string, rules []string, am address, queryAddresses []address, queryFileSDAddresses []address) *serverScheduler { | ||
| func rule(http, grpc address, ruleDir string, am address, queryAddresses []address, queryFileSDAddresses []address) *serverScheduler { | ||
| return &serverScheduler{ | ||
| HTTP: http, | ||
| GRPC: grpc, | ||
| schedule: func(workDir string) (Exec, error) { |
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.
This change ensures that the /api/v1/rules endpoint returns the original path of the rule file instead of the path of the temporary file generated by Thanos ruler.
Changes
The mapping from the original rule filenames to the temporary filenames is stored in the
github.com/thanos-io/thanos/pkg/rule.Managerstruct.Verification
Added end-to-end tests.