pkg/reloader: remove mention of rule directories #3108
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
yeya24
approved these changes
Sep 1, 2020
squat
reviewed
Sep 1, 2020
pkg/reloader/reloader.go
Outdated
| @@ -220,10 +220,10 @@ func (r *Reloader) Watch(ctx context.Context) error { | |||
|
|
|||
| r.watches.Set(float64(len(watchables))) | |||
| level.Info(r.logger).Log( | |||
| "msg", "started watching config file and recursively rule dirs for changes", | |||
| "msg", "started watching config file and recursively dirs for changes", | |||
There was a problem hiding this comment.
nit:
Suggested change
| "msg", "started watching config file and recursively dirs for changes", | |
| "msg", "started watching config file and directories recursively for changes", |
There was a problem hiding this comment.
Done. I've removed recursively because the reloader doesn't watch directories recursively.
The `reloader` package doesn't care whether the watched directories contain rule files or something else. This change removes the references to "rule directories" and uses "watched directories" instead. Signed-off-by: Simon Pasquier <spasquie@redhat.com>
simonpasquier
force-pushed
the
update-reloader-option-for-dirs
branch
from
47c6ac2
to
73df71f
Compare
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.
Changes
The
reloaderpackage doesn't care whether the watched directoriescontain rule files or something else. This change removes the references
to "rule directories" and uses "watched directories" instead.
The motivation is that prometheus-operator use 2 reloaders:
github.com/thanos-io/thanos/pkg/reloaderpackageEventually we may consolidate and have only one reloader instance (presumably prometheus-config-reloader). Having to provide a
RulesDiroption to reload Alertmanager is slightly inconsistent.Verification
No unit or e2e test added since there's no functional change.