Skip to content

[7.17](backport #35734) Add new fingerprint file identity #36064

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.

Sign up for GitHub

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

Jump to bottom
Merged
rdner merged 4 commits into from
Jul 14, 2023
Merged

[7.17](backport #35734) Add new fingerprint file identity #36064

rdner merged 4 commits into from
Jul 14, 2023

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2023 •
edited by zube bot
Loading

This is an automatic backport of pull request #35734 done by Mergify.
Cherry-pick of b701377 has failed:

On branch mergify/bp/7.17/pr-35734
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit b701377c9b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl
	modified:   filebeat/docs/inputs/input-common-file-options.asciidoc
	modified:   filebeat/docs/inputs/input-filestream-file-options.asciidoc
	modified:   filebeat/docs/inputs/input-filestream.asciidoc
	modified:   filebeat/filebeat.reference.yml
	modified:   filebeat/input/filestream/copytruncate_prospector.go
	modified:   filebeat/input/filestream/environment_test.go
	new file:   filebeat/input/filestream/identifier_fingerprint.go
	modified:   filebeat/input/filestream/identifier_inode_deviceid.go
	modified:   filebeat/input/filestream/identifier_test.go
	modified:   filebeat/input/filestream/internal/input-logfile/fswatch.go
	modified:   filebeat/input/filestream/logger.go
	modified:   filebeat/input/filestream/prospector_creator.go
	modified:   x-pack/filebeat/filebeat.reference.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/input/filestream/config.go
	both modified:   filebeat/input/filestream/fswatch.go
	both modified:   filebeat/input/filestream/fswatch_test.go
	both modified:   filebeat/input/filestream/identifier.go
	both modified:   filebeat/input/filestream/prospector.go
	both modified:   filebeat/input/filestream/prospector_test.go
	both modified:   libbeat/metric/system/cgroup/cgcommon/metrics_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@rdner @mergify
Add new fingerprint file identity (#35734)
a2ea1a6 
This is a new alternative to existing options like `native`, `path`
and `inode_marker`.

Unlike the existing options, this file identity does not rely on any
file system metadata and uses only the file size and its content.

Users can specify what amount of bytes is used to fingerprint the
beginning of each file, optionally it's possible to set an offset from the beginning.

This identity is supposed to be more stable and less affected by the
environment/setup of the users.

This change also contains a few performance optimisations of how we work with the filesystem and watch for file changes.

(cherry picked from commit b701377)

# Conflicts:
#	filebeat/input/filestream/config.go
#	filebeat/input/filestream/fswatch.go
#	filebeat/input/filestream/fswatch_test.go
#	filebeat/input/filestream/identifier.go
#	filebeat/input/filestream/prospector.go
#	filebeat/input/filestream/prospector_test.go
#	libbeat/metric/system/cgroup/cgcommon/metrics_test.go
@mergify mergify bot requested a review from a team as a code owner July 14, 2023 06:23
@mergify mergify bot added the backport label Jul 14, 2023
@mergify mergify bot removed the request for review from a team July 14, 2023 06:23
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 14, 2023
@mergify mergify bot requested review from belimawr and leehinman July 14, 2023 06:23
@mergify mergify bot assigned rdner Jul 14, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 14, 2023
@botelastic
Copy link

botelastic bot commented Jul 14, 2023

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Contributor

elasticmachine commented Jul 14, 2023 •
edited by jenkins-beats-ci bot
Loading

💚 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-07-14T07:54:39.489+0000

  • Duration: 65 min 26 sec

Test stats 🧪

Test Results
Failed 0
Passed 6320
Skipped 533
Total 6853

💚 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!)

@rdner rdner enabled auto-merge (squash) July 14, 2023 08:01
@rdner rdner merged commit fbd3ff8 into 7.17 Jul 14, 2023
@rdner rdner deleted the mergify/bp/7.17/pr-35734 branch July 14, 2023 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@belimawr belimawr Awaiting requested review from belimawr belimawr is a code owner automatically assigned from elastic/elastic-agent-data-plane

@leehinman leehinman Awaiting requested review from leehinman leehinman is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@rdner rdner

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @rdner