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

[7.x](backport #27774) [Filebeat] Update compatibility function to remove processor description on ES < 7.9.0 #27805

Merged
merged 1 commit into from
Sep 10, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 8, 2021

This is an automatic backport of pull request #27774 done by Mergify.
Cherry-pick of 6e290c8 has failed:

On branch mergify/bp/7.x/pr-27774
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 6e290c8156.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/fileset/compatibility.go
	both modified:   filebeat/fileset/compatibility_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.io/

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 8, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 8, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 8, 2021

💚 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: 2021-09-09T20:48:39.498+0000

  • Duration: 98 min 3 sec

  • Commit: a7313cd

Test stats 🧪

Test Results
Failed 0
Passed 15254
Skipped 2327
Total 17581

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 15254
Skipped 2327
Total 17581

@legoguy1000
Copy link
Contributor

@andrewkroh Looks like there are conflicts on the backport

@andrewkroh
Copy link
Member

andrewkroh commented Sep 9, 2021

There was a backport missing #27841. After that merges I'll rebase this one.

@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2021
@andrewkroh andrewkroh added Filebeat Filebeat needs_team Indicates that the issue/PR needs a Team:* label labels Sep 9, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2021
@botelastic
Copy link

botelastic bot commented Sep 9, 2021

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

…ion on ES < 7.9.0 (#27774)

* Update Filebeat compatibility function to remove processor description field on ES < 7.9.0

* Fix function description

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
@andrewkroh andrewkroh force-pushed the mergify/bp/7.x/pr-27774 branch from 8d1ced0 to a7313cd Compare September 9, 2021 20:48
@andrewkroh andrewkroh merged commit 4f081e6 into 7.x Sep 10, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-27774 branch September 10, 2021 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Filebeat Filebeat
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants