[8.10](backport #36557) [filestream] revert change in symlink resolut…

…ion (#36580) * [filestream] revert change in symlink resolution (#36557) --------- Co-authored-by: Tiago Queiroz <[email protected]> Co-authored-by: Denis <[email protected]> (cherry picked from commit b7d1f80)
elastic · Sep 13, 2023 · e5b201e · e5b201e
1 parent 9ba03f4
commit e5b201e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -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*
 

diff --git a/filebeat/input/filestream/fswatch.go b/filebeat/input/filestream/fswatch.go
@@ -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) {