Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[filestream] revert change in symlink resolution #36557

Merged
merged 4 commits into from
Sep 13, 2023

Conversation

leehinman
Copy link
Contributor

@leehinman leehinman commented Sep 11, 2023

Proposed commit message

Revert change introduced in #35734, where if a symbolic link could not be resolved it prevented ingest. Previously this was a debug error, but the file was still ingested.

This restores the original behavior.

This impacts Windows users that mount drives inside of folders.

Checklist

  • My code follows the style guidelines of this project
    - [ ] I have commented my code, particularly in hard-to-understand areas
    - [ ] I have made corresponding changes to the documentation
    - [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

On Windows host mount a drive inside a folder and ingest linked files from there.

https://learn.microsoft.com/en-us/windows-server/storage/disk-management/assign-a-mount-point-folder-path-to-a-drive

Related issues

Use cases

Screenshots

Logs

@leehinman leehinman requested a review from a team as a code owner September 11, 2023 16:58
@leehinman leehinman requested review from belimawr and rdner September 11, 2023 16:58
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 11, 2023
@mergify
Copy link
Contributor

mergify bot commented Sep 11, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @leehinman? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@leehinman leehinman added Team:Elastic-Agent Label for the Agent team bugfix labels Sep 11, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 11, 2023
@leehinman leehinman added needs_team Indicates that the issue/PR needs a Team:* label backport-7.17 Automated backport to the 7.17 branch with mergify labels Sep 11, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 11, 2023
@leehinman leehinman added the backport-v8.10.0 Automated backport with mergify label Sep 11, 2023
CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 11, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-09-12T20:37:30.107+0000

  • Duration: 71 min 59 sec

Test stats 🧪

Test Results
Failed 0
Passed 8237
Skipped 753
Total 8990

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

Co-authored-by: Tiago Queiroz <[email protected]>
filebeat/input/filestream/fswatch.go Outdated Show resolved Hide resolved
@leehinman leehinman merged commit b7d1f80 into elastic:main Sep 13, 2023
8 checks passed
mergify bot pushed a commit that referenced this pull request Sep 13, 2023
* [filestream] revert change in symlink resolution

---------

Co-authored-by: Tiago Queiroz <[email protected]>
Co-authored-by: Denis <[email protected]>
(cherry picked from commit b7d1f80)
mergify bot pushed a commit that referenced this pull request Sep 13, 2023
* [filestream] revert change in symlink resolution

---------

Co-authored-by: Tiago Queiroz <[email protected]>
Co-authored-by: Denis <[email protected]>
(cherry picked from commit b7d1f80)
leehinman pushed a commit that referenced this pull request Sep 13, 2023
…ion (#36579)

* [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)
leehinman pushed a commit that referenced this pull request Sep 13, 2023
…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)
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
* [filestream] revert change in symlink resolution

---------

Co-authored-by: Tiago Queiroz <[email protected]>
Co-authored-by: Denis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.10.0 Automated backport with mergify bugfix Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants