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 #25608) [Filebeat] fortinet.firewall.addr is not always an IP address #25649

Merged
merged 2 commits into from
Jun 25, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2021

This is an automatic backport of pull request #25608 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/

@mergify mergify bot added the backport label May 10, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 10, 2021
@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: Pull request #25649 updated

  • Start Time: 2021-06-24T09:57:03.084+0000

  • Duration: 106 min 31 sec

  • Commit: 9367534

Test stats 🧪

Test Results
Failed 0
Passed 7364
Skipped 1201
Total 8565

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 7364
Skipped 1201
Total 8565

@P1llus
Copy link
Member

P1llus commented May 11, 2021

run tests

@andrewkroh
Copy link
Member

@Mergifyio rebase

* 25585: `fortinet.firewall.addr` is not always an IP address

* update sample logs

* fixed pipeline

(cherry picked from commit 2fc3a4d)
@cachedout cachedout force-pushed the mergify/bp/7.x/pr-25608 branch from 78f9bb3 to 8638fe1 Compare May 18, 2021 15:52
@mergify
Copy link
Contributor Author

mergify bot commented May 18, 2021

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor Author

mergify bot commented May 25, 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.x/pr-25608 upstream/mergify/bp/7.x/pr-25608
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-25608

@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 Jun 24, 2021
@P1llus P1llus merged commit 1fd6b29 into 7.x Jun 25, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-25608 branch June 25, 2021 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants