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.

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

[8.15](backport #41179) x-pack/filebeat/input/entityanalytics/provider/activedirectory: improve modification time and deletion logic #41385

Merged
merged 2 commits into from
Oct 23, 2024
Merged

[8.15](backport #41179) x-pack/filebeat/input/entityanalytics/provider/activedirectory: improve modification time and deletion logic #41385

merged 2 commits into from
Oct 23, 2024
+103 −92

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 22, 2024

Proposed commit message

See title.

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.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

This is an automatic backport of pull request #41179 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner October 22, 2024 23:37
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 22, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 22, 2024

Cherry-pick of 6b54074 has failed:

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

You are currently cherry-picking commit 6b540745cb.
  (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:   x-pack/filebeat/input/entityanalytics/provider/activedirectory/statestore.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go

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

@mergify mergify bot assigned efd6 Oct 22, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 22, 2024
@botelastic
Copy link

botelastic bot commented Oct 22, 2024

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

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 23, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.15/pr-41179 upstream/mergify/bp/8.15/pr-41179
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-41179

@efd6
x-pack/filebeat/input/entityanalytics/provider/activedirectory: impro…
9cf613c 
…ve modification time and deletion logic (#41179)

This improves the update time stamps of modified events by using the
documents' whenChanged fields in the case of returned documents, and the
current time when a document is identified as having been deleted. The latest
of these is used to determine the time filter for the next Active Directory
query.

Documents are marked as deleted only when they are found to not exist in full
sync collection, and are removed from the state store when they are
identified as deleted. The change in behaviour to not use updates to identify
corrects behaviour that would cause older but not deleted entities to be
deleted from the index.

(cherry picked from commit 6b54074)

# Conflicts:
#	x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go
@efd6
fix cherry pick failures
63d71c1
@efd6 efd6 changed the title [8.15](backport #41179) x-pack/filebeat/input/entityanalytics/provider/activedirectory: don't publish unmodified updates [8.15](backport #41179) x-pack/filebeat/input/entityanalytics/provider/activedirectory: improve modification time and deletion logic Oct 23, 2024
@efd6 efd6 enabled auto-merge (squash) October 23, 2024 01:22
@efd6 efd6 merged commit 952f579 into 8.15 Oct 23, 2024
20 of 22 checks passed
@efd6 efd6 deleted the mergify/bp/8.15/pr-41179 branch October 23, 2024 03:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@efd6 efd6 efd6 approved these changes

Assignees

@efd6 efd6

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.
1 participant
@efd6