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

[filebeat][fortinet] Use default add_locale for fortinet.firewall (backport #26524) #26659

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2021

This is an automatic backport of pull request #26524 done by Mergify.


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/

…6524)

* Use default add_locale for fortinet.firewall

* Use event.timezone in all date processors

(cherry picked from commit 5d258c8)
@mergify mergify bot added the backport label Jul 1, 2021
@mergify mergify bot assigned marc-gr Jul 1, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 1, 2021
@botelastic
Copy link

botelastic bot commented Jul 1, 2021

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

@elasticmachine
Copy link
Collaborator

💚 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: Pull request #26659 opened

  • Start Time: 2021-07-01T11:40:47.042+0000

  • Duration: 124 min 48 sec

  • Commit: 297f71f

Test stats 🧪

Test Results
Failed 0
Passed 14091
Skipped 2326
Total 16417

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 14091
Skipped 2326
Total 16417

@mergify
Copy link
Contributor Author

mergify bot commented Jul 1, 2021

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/7.14/pr-26524 upstream/mergify/bp/7.14/pr-26524
git merge upstream/7.14
git push upstream mergify/bp/7.14/pr-26524

@marc-gr
Copy link
Contributor

marc-gr commented Jul 5, 2021

Duplicate from #26660

@marc-gr marc-gr closed this Jul 5, 2021
@mergify mergify bot deleted the mergify/bp/7.14/pr-26524 branch July 5, 2021 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants