diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 5e609d5daa8..bb6d0259242 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -105,6 +105,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Remove 'onFilteredOut' and 'onDroppedOnPublish' callback logs {issue}36299[36299] {pull}36399[36399] - Added a fix for Crowdstrike pipeline handling process arrays {pull}36496[36496] - Ensure winlog input retains metric collection when handling recoverable errors. {issue}36479[36479] {pull}36483[36483] +- 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 index 39d0275cfef..8986794340d 100644 --- 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) {