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

otel: add test for document equivalence between agent filestream input and filebeat receiver #6681

Open
wants to merge 22 commits into
base: main
Choose a base branch
from

Merge branch 'main' into hybrid-agent-test

ff2f810
Select commit
Loading
Failed to load commit list.
Open

otel: add test for document equivalence between agent filestream input and filebeat receiver #6681

Merge branch 'main' into hybrid-agent-test
ff2f810
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Feb 11, 2025 in 1s

28 potential rules

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)

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

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

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

Rule: notify the backport policy (comment)

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

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.2 branch (backport)

  • label=backport-v8.2.0
  • 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.16 branch (backport)

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

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

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

Rule: backport patches to 8.17 branch (backport)

  • label=backport-8.17
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.18 branch (backport)

  • label=backport-8.18
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 9.0 branch (backport)

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

Rule: backport patches to all active minor branches for the 8 major. (backport)

  • label=backport-active-8
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to all active minor branches for the 9 major. (backport)

  • label=backport-active-9
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to all active branches (backport)

  • label=backport-active-all
  • 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!


6 not applicable rules

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

  • closed [📌 delete_head_branch requirement]
  • all of:
    • files~=^\.go-version$
    • head~=^updatecli.*
  • any of:
    • closed
    • merged

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

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

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

  • files~=^\.mergify\.yml$
  • head~=^add-backport-next.*
  • #approved-reviews-by>=1
  • -closed [📌 queue requirement]
  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • check-success=buildkite/elastic-agent
  • 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 branch protection]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-success = CLA
        • check-neutral = CLA
        • check-skipped = CLA
      • any of: [🛡 GitHub branch protection]
        • check-success = buildkite/elastic-agent
        • check-neutral = buildkite/elastic-agent
        • check-skipped = buildkite/elastic-agent

Rule: delete upstream branch for mergify backports (delete_head_branch)

  • closed [📌 delete_head_branch requirement]
  • all of:
    • head~=^mergify/bp/.*
  • any of:
    • closed
    • merged

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

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

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

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