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.13](backport #25609) [Filebeat] Fix checkpoint.action_reason when its a string, not a Long #25633

Merged
merged 2 commits into from
May 10, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2021

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

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

You are currently cherry-picking commit f432b92234.
  (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/docs/fields.asciidoc
	modified:   x-pack/filebeat/module/checkpoint/firewall/_meta/fields.yml
	modified:   x-pack/filebeat/module/checkpoint/firewall/ingest/pipeline.yml
	modified:   x-pack/filebeat/module/checkpoint/firewall/test/checkpoint_with_time.log
	modified:   x-pack/filebeat/module/checkpoint/firewall/test/checkpoint_with_time.log-expected.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/module/checkpoint/fields.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

…25609)

(cherry picked from commit f432b92)

# Conflicts:
#	x-pack/filebeat/module/checkpoint/fields.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 10, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 10, 2021
@botelastic
Copy link

botelastic bot commented May 10, 2021

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 10, 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

Expand to view the summary

Build stats

  • Build Cause: P1llus commented: /test

  • Start Time: 2021-05-10T15:23:46.091+0000

  • Duration: 31 min 55 sec

  • Commit: 88c0443

Test stats 🧪

Test Results
Failed 0
Passed 928
Skipped 188
Total 1116

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 928
Skipped 188
Total 1116

@P1llus
Copy link
Member

P1llus commented May 10, 2021

run tests

@P1llus
Copy link
Member

P1llus commented May 10, 2021

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented May 10, 2021

Command refresh: success

Pull request refreshed

@P1llus
Copy link
Member

P1llus commented May 10, 2021

/test

@P1llus P1llus merged commit fd9564b into 7.13 May 10, 2021
@mergify mergify bot deleted the mergify/bp/7.13/pr-25609 branch May 10, 2021 18: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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants