Skip to content

Commit

Permalink
[8.10](backport #36557) [filestream] revert change in symlink resolut…
Browse files Browse the repository at this point in the history
…ion (#36580)

* [filestream] revert change in symlink resolution (#36557)

---------

Co-authored-by: Tiago Queiroz <contato@tiago.eti.br>
Co-authored-by: Denis <denis@rdner.de>
(cherry picked from commit b7d1f80)
  • Loading branch information
mergify[bot] authored Sep 13, 2023
1 parent 9ba03f4 commit e5b201e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Fixes "Can only start an input when all related states are finished" error when running under Elastic-Agent {pull}35250[35250] {issue}33653[33653]
- [system] sync system/auth dataset with system integration 1.29.0. {pull}35581[35581]
- [GCS Input] - Fixed an issue where bucket_timeout was being applied to the entire bucket poll interval and not individual bucket object read operations. Fixed a map write concurrency issue arising from data races when using a high number of workers. Fixed the flaky tests that were present in the GCS test suit. {pull}35605[35605]
- Revert error introduced in {pull}35734[35734] when symlinks can't be resolved in filestream. {pull}36557[36557]

*Heartbeat*

Expand Down
3 changes: 2 additions & 1 deletion filebeat/input/filestream/fswatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,8 @@ func (s *fileScanner) getIngestTarget(filename string) (it ingestTarget, err err

it.originalFilename, err = filepath.EvalSymlinks(it.filename)
if err != nil {
return it, fmt.Errorf("failed to resolve the symlink %q: %w", it.filename, err)
s.log.Debugf("finding path to original file has failed %s: %+v", it.filename, err)
it.originalFilename = it.filename
}

if s.isFileExcluded(it.originalFilename) {
Expand Down

0 comments on commit e5b201e

Please sign in to comment.