[file-sd-part-3] Added file sd to rule #547
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
ivan-valkov
force-pushed
the
file-sd-rule
branch
4 times, most recently
from
575c9b3
to
1e633d1
Compare
ivan-valkov
force-pushed
the
file-sd-query
branch
from
df34473
to
6c9aca9
Compare
ivan-valkov
force-pushed
the
file-sd-rule
branch
from
1e633d1
to
fca9f88
Compare
ivan-valkov
force-pushed
the
file-sd-query-test
branch
from
98d95c0
to
4dc205f
Compare
ivan-valkov
force-pushed
the
file-sd-rule
branch
from
fca9f88
to
5bf8121
Compare
ivan-valkov
force-pushed
the
file-sd-query-test
branch
2 times, most recently
from
89afd05
to
b07ebc2
Compare
ivan-valkov
force-pushed
the
file-sd-rule
branch
2 times, most recently
from
0c68519
to
b9a7cf0
Compare
ivan-valkov
changed the title
ivan-valkov
force-pushed
the
file-sd-rule
branch
from
b9a7cf0
to
75ea2e7
Compare
ivan-valkov
force-pushed
the
file-sd-query-test
branch
from
e46e182
to
92a046a
Compare
ivan-valkov
force-pushed
the
file-sd-rule
branch
from
75ea2e7
to
965b239
Compare
domgreen
reviewed
Oct 12, 2018
cmd/thanos/rule.go
Outdated
| @@ -168,9 +185,15 @@ func runRule( | |||
| }) | |||
| } | |||
|
|
|||
| // FileSD query addresses | |||
| fileSDCache := newFileSDCache() | |||
There was a problem hiding this comment.
should we look at moving this to a seperate pkg? I know its still being used in this one package but it might feel nicer now that its not just in the compact.go
cmd/thanos/rule.go
Outdated
| @@ -75,6 +77,9 @@ func registerRule(m map[string]setupFunc, app *kingpin.Application, name string) | |||
|
|
|||
| objStoreConfig := regCommonObjStoreFlags(cmd, "") | |||
|
|
|||
| filesToWatch := cmd.Flag("query-sd-file", "Path to file that contain addresses of query peers. The path can be a glob pattern (repeatable)."). | |||
There was a problem hiding this comment.
as part 1 can we update the flag :)
ivan-valkov
force-pushed
the
file-sd-query-test
branch
from
92a046a
to
5093da5
Compare
ivan-valkov
force-pushed
the
file-sd-rule
branch
2 times, most recently
from
e5c31e4
to
e5bcfed
Compare
domgreen
reviewed
Oct 12, 2018
cmd/thanos/rule.go
Outdated
| @@ -96,6 +102,16 @@ func registerRule(m map[string]setupFunc, app *kingpin.Application, name string) | |||
| NoLockfile: true, | |||
| WALFlushInterval: 30 * time.Second, | |||
| } | |||
|
|
|||
| var filesd *file.Discovery | |||
There was a problem hiding this comment.
same comments in here as from @bwplotka in part 1 fileSD etc.
domgreen
reviewed
Oct 12, 2018
cmd/thanos/rule.go
Outdated
| @@ -75,6 +78,9 @@ func registerRule(m map[string]setupFunc, app *kingpin.Application, name string) | |||
|
|
|||
| objStoreConfig := regCommonObjStoreFlags(cmd, "") | |||
|
|
|||
| filesToWatch := cmd.Flag("store.file-sd-config", "Path to file that contain addresses of query peers. The path can be a glob pattern (repeatable)."). | |||
There was a problem hiding this comment.
store.file-sd-config > store.file-sd-config.files? or is that just over-complicating things?
ivan-valkov
force-pushed
the
file-sd-query-test
branch
from
4858fca
to
940080a
Compare
ivan-valkov
force-pushed
the
file-sd-rule
branch
from
e5bcfed
to
7180ccc
Compare
ivan-valkov
force-pushed
the
file-sd-query-test
branch
from
940080a
to
1e77f44
Compare
ivan-valkov
force-pushed
the
file-sd-rule
branch
from
28392c6
to
7d55dfc
Compare
domgreen
approved these changes
Oct 16, 2018
ivan-valkov
force-pushed
the
file-sd-query-test
branch
from
1e77f44
to
49718a7
Compare
ivan-valkov
force-pushed
the
file-sd-rule
branch
from
7d55dfc
to
3e4abbd
Compare
* Added flag for query addresses to ruler
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.
ref: #492
Changes
Added file sd to ruler. You can specify files to watch via a command line flag. Then the ruler will load queriers' addresses from the files whenever the files are updated.
Verification
Tests in this PR: #556