Fix relative paths in prospectors definitions #5443
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
tsg
added
bug
Filebeat
tsg
force-pushed
the
fix_globs_with_relative_paths
branch
from
ccbe636
to
374b14b
Compare
urso
reviewed
Oct 26, 2017
filebeat/prospector/log/config.go
Outdated
| @@ -189,3 +192,17 @@ func (c *config) resolvePaths() error { | |||
| c.Paths = paths | |||
| return nil | |||
| } | |||
|
|
|||
| // makeGlobsAbsolute calls `filepath.Abs` on all the globs from config | |||
| func (c *config) makeGlobsAbsolute() error { | |||
urso
reviewed
Oct 26, 2017
| return nil, fmt.Errorf("Failed to resolve recursive globs in config: %+v", err) | ||
| } | ||
| if err := p.config.makeGlobsAbsolute(); err != nil { | ||
| return nil, fmt.Errorf("Failed to make globs absolute: %+v", err) |
There was a problem hiding this comment.
msg: 'Failed to normalize glob patterns: ' ?
tsg
force-pushed
the
fix_globs_with_relative_paths
branch
from
374b14b
to
18a4929
Compare
tsg
added
v6.1.0
and removed
needs_backport
tsg
force-pushed
the
fix_globs_with_relative_paths
branch
from
18a4929
to
0a7efae
Compare
If a relative path was used in a prospector definition, it could happen that when loading the state from the registry, the path didn't match the pattern, which made it ignore the saved state. Fixes elastic#5442. Additionally, this PR cleans up some code related to the `recursive_glob` setting. The docs used to claim that the feature is disabled by default, but that wasn't the case and it was impossible to disable it. This change leaves it enabled by default, but makes it possible to disable it.
tsg
force-pushed
the
fix_globs_with_relative_paths
branch
from
0a7efae
to
3c36792
Compare
|
Jenkins, test it. |
andrewkroh
reviewed
Nov 6, 2017
| @@ -115,7 +117,7 @@ func NewProspector( | |||
| // It goes through all states coming from the registry. Only the states which match the glob patterns of | |||
| // the prospector will be loaded and updated. All other states will not be touched. | |||
| func (p *Prospector) loadStates(states []file.State) error { | |||
| logp.Debug("prospector", "exclude_files: %s", p.config.ExcludeFiles) | |||
| logp.Debug("prospector", "exclude_files: %s. Number of stats: %d", p.config.ExcludeFiles, len(states)) | |||
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.
If a relative path was used in a prospector definition, it could happen
that when loading the state from the registry, the path didn't match the
pattern, which made it ignore the saved state. Fixes #5442.
Additionally, this PR cleans up some code related to the
recursive_globsetting. The docs used to claim that the feature is disabled by default, but
that wasn't the case and it was impossible to disable it. This change leaves
it enabled by default, but makes it possible to disable it.