Added basic file sd based on prom file sd #536
Closed
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
|
Looks like tests are legitimately failing (: |
|
yeah, |
bwplotka
reviewed
Oct 5, 2018
| "github.com/improbable-eng/thanos/pkg/runutil" | ||
| "gopkg.in/yaml.v2" | ||
| "io/ioutil" | ||
| "os" |
| func (d *FileDiscoverer) Run(ctx context.Context, ch chan<- *Discoverable) { | ||
| watcher, err := fsnotify.NewWatcher() | ||
| if err != nil { | ||
| level.Error(d.logger).Log("msg", "Error adding file watcher", "err", err) |
There was a problem hiding this comment.
This err is not really handled (:
| } | ||
|
|
||
| // listFiles returns a list of all files that match the configured patterns. | ||
| func (d *FileDiscoverer) listFiles() []string { |
| for _, p := range d.paths { | ||
| files, err := filepath.Glob(p) | ||
| if err != nil { | ||
| level.Error(d.logger).Log("msg", "Error expanding glob", "glob", p, "err", err) |
| // updated discoverables through the channel. | ||
| func (d *FileDiscoverer) refresh(ctx context.Context, ch chan<- *Discoverable) { | ||
| ref := map[string]struct{}{} | ||
| for _, p := range d.listFiles() { |
| for _, p := range d.listFiles() { | ||
| discoverable, err := d.readFile(p) | ||
| if err != nil { | ||
| level.Error(d.logger).Log("msg", "Error reading file", "path", p, "err", err) |
There was a problem hiding this comment.
Log lines should not captialised
|
|
||
| case err := <-d.watcher.Errors: | ||
| if err != nil { | ||
| level.Error(d.logger).Log("msg", "Error watching file", "err", err) |
|
agreed to reuse prometheus file sd instead of creating this one |
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 basic file service discovery heavily based on prometheus' fileSD (https://github.com/prometheus/prometheus/blob/master/discovery/file/file.go)
The biggest difference is that we are not using target groups. That's why we cannot just use prometheus' fileSD. Instead, discovered files are represented in a struct that contains a list of strings.
The format of the files and therefore how we represent them is up for discussion. The current accepted format is just a json or yaml list of addresses.
Verification
Used the fileSD test from prometheus but modified it to not use target groups. (https://github.com/prometheus/prometheus/blob/master/discovery/file/file_test.go)