Always use absolute path for event and registry #3328
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
ruflin
commented
Jan 10, 2017
filebeat/harvester/log.go
Outdated
| @@ -137,6 +137,7 @@ func (h *Harvester) Harvest(r reader.Reader) { | |||
| event.InputType = h.config.InputType | |||
| event.DocumentType = h.config.DocumentType | |||
| event.JSONConfig = h.config.JSON | |||
| event.Name = h.state.Fileinfo.Name() | |||
There was a problem hiding this comment.
I added this for discussion as it was requested several times in the past.
ruflin
force-pushed
the
relative-state-path
branch
2 times, most recently
from
95a37cf
to
11d60f0
Compare
ruflin
force-pushed
the
relative-state-path
branch
2 times, most recently
from
feac103
to
5fc6fc5
Compare
andrewkroh
reviewed
Jan 31, 2017
filebeat/_meta/fields.common.yml
Outdated
| @@ -10,6 +10,11 @@ | |||
| The file from which the line was read. This field contains the full path to the file. | |||
There was a problem hiding this comment.
Can you drop the "absolute" keyword somewhere in the source description.
There was a problem hiding this comment.
I replaced full with absolute.
ruflin
force-pushed
the
relative-state-path
branch
5 times, most recently
from
bcde6c0
to
c295289
Compare
tsg
reviewed
Feb 7, 2017
filebeat/_meta/fields.common.yml
Outdated
| For example: `/var/log/system.log`. | ||
|
|
||
| - name: name |
There was a problem hiding this comment.
Note sure about calling it "name" since it might ambiguous. How about "filename"?
ruflin
force-pushed
the
relative-state-path
branch
from
c295289
to
ab1e217
Compare
|
I removed the |
During some testing with filebeat I realised that when a relative path glob is put into the filebeat config, the event will contain the relative path and also the state. In most cases this should not be an issue and so far no issues were reported. For the state itself it is not an issue as they are compared based on inode/device. It could become an issue on restart in case a config was changed from a relative to an absolute path and the prospector does not detect, that the state would belong to the same prospector. This could also have an affect when migrating to this solutions. Old states could be left over in the registry file. But this requires, that someone was using relative paths before which was never recommended.
ruflin
force-pushed
the
relative-state-path
branch
from
ab1e217
to
33ec85b
Compare
pcfens
added a commit
to pcfens/puppet-filebeat
that referenced
this pull request
Mar 28, 2017
The default registry file must use an absolute path (elastic/beats#3328). This is probably a breaking change. Fixes #46
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.
During some testing with filebeat I realised that when a relative path glob is put into the filebeat config, the event will contain the relative path and also the state. In most cases this should not be an issue and so far no issues were reported.
For the state itself it is not an issue as they are compared based on inode/device. It could become an issue on restart in case a config was changed from a relative to an absolute path and the prospector does not detect, that the state would belong to the same prospector. This could also have an affect when migrating to this solutions. Old states could be left over in the registry file. But this requires, that someone was using relative paths before.