Skip to content

Merge branch '7.17' into mergify/bp/7.17/pr-39392

a089708
Select commit
Loading
Failed to load commit list.
Merged

[7.17](backport #39392) [Bug] fix high IO after sudden filebeat stop (#35893) #39795

Merge branch '7.17' into mergify/bp/7.17/pr-39392
a089708
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Sep 23, 2024 in 3s

20 potential rules

⚠️ The pull request has been merged by @belimawr

Rule: self-assign PRs (assign)

  • #assignee=0
  • -closed
  • -merged

Rule: forward-port patches to main branch (backport)

  • label=forwardport-main
  • merged
  • merged [📌 backport requirement]

Rule: ask to resolve conflict (comment)

  • -closed
  • -merged
  • conflict
  • -author=apmmachine

Rule: automatic squash and merge with success checks and the files matching the regex ^testing/environments/snapshot* are modified. (queue)

  • -closed [📌 queue requirement]
  • files~=^testing/environments/snapshot.*\.yml$
  • label=automation
  • #approved-reviews-by>=1
  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • check-success=buildkite/beats
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • any of: [🛡 GitHub branch protection]
        • check-success = CLA
        • check-neutral = CLA
        • check-skipped = CLA
      • any of: [🛡 GitHub branch protection]
        • check-success = buildkite/beats
        • check-neutral = buildkite/beats
        • check-skipped = buildkite/beats

Rule: notify the backport has not been merged yet (comment)

  • -closed
  • -merged
  • schedule=Mon-Mon 06:00-10:00[Europe/Paris]
  • #assignee>=1
  • #check-success>0
  • author=mergify[bot]

Rule: backport patches to 7.17 branch (backport)

  • label~=^(backport-v7.17.0|backport-7.17)$
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.3 branch (backport)

  • label=backport-v8.3.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.4 branch (backport)

  • label=backport-v8.4.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.5 branch (backport)

  • label=backport-v8.5.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.6 branch (backport)

  • label=backport-v8.6.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.7 branch (backport)

  • label=backport-v8.7.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.8 branch (backport)

  • label=backport-v8.8.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.9 branch (backport)

  • label=backport-v8.9.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.10 branch (backport)

  • label=backport-v8.10.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.11 branch (backport)

  • label=backport-v8.11.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.12 branch (backport)

  • label=backport-v8.12.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.13 branch (backport)

  • label=backport-v8.13.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.14 branch (backport)

  • label=backport-v8.14.0
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.15 branch (backport)

  • label~=^(backport-v8.15.0|backport-8.15)$
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.x branch (backport)

  • label~=^(backport-v8.x|backport-8.x)$
  • merged
  • merged [📌 backport requirement]

💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!


9 not applicable rules

Rule: close automated pull requests with bump updates if any conflict (close)

  • -closed
  • -merged
  • author=apmmachine
  • conflict
  • label=automation

Rule: automatic approval for automated pull requests with bump updates (review)

  • author=apmmachine
  • files~=^testing/environments/snapshot.*\.yml$
  • label=automation
  • check-success=buildkite/beats

Rule: delete upstream branch after merging changes on testing/environments/snapshot* or it's closed (delete_head_branch)

  • all of:
    • files~=^testing/environments/snapshot.*\.yml$
    • head~=^updatecli_bump-elastic-stack
    • label=automation
  • closed [📌 delete_head_branch requirement]
  • any of:
    • closed
    • merged

Rule: delete upstream branch after merging changes on .go-version or it's closed (delete_head_branch)

  • all of:
    • files~=^\.go-version$
    • head~=^updatecli_bump-golang-version
    • label=automation
  • closed [📌 delete_head_branch requirement]
  • any of:
    • closed
    • merged

Rule: automatic approval for mergify pull requests with changes in bump-rules (review)

  • files~=^\.mergify\.yml$
  • head~=^add-backport-next.*
  • label=automation
  • author=mergify[bot]
  • check-success=buildkite/beats

Rule: automatic squash and merge with success checks and the files matching the regex ^.mergify.yml is modified. (queue)

  • -closed [📌 queue requirement]
  • files~=^\.mergify\.yml$
  • head~=^add-backport-next.*
  • label=automation
  • #approved-reviews-by>=1
  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • check-success=buildkite/beats
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • any of: [🛡 GitHub branch protection]
        • check-success = CLA
        • check-neutral = CLA
        • check-skipped = CLA
      • any of: [🛡 GitHub branch protection]
        • check-success = buildkite/beats
        • check-neutral = buildkite/beats
        • check-skipped = buildkite/beats

Rule: delete upstream branch with changes on ^.mergify.yml that has been merged or closed (delete_head_branch)

  • all of:
    • files~=^\.mergify\.yml$
    • head~=^add-backport-next.*
    • label=automation
  • closed [📌 delete_head_branch requirement]
  • any of:
    • closed
    • merged

Rule: notify the backport policy (comment)

  • -closed
  • -label~=^backport
  • -merged
  • base=main

Rule: add backport-8.x label for main only if no skipped or assigned already (comment, label)

  • -closed
  • -merged
  • base=main
  • -label~=^(backport-skip|backport-8.x)$
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.com