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

Add additional config remapping for "api_key" and "secret_token" for libbeat instrumentation wrapper #13691

Merged
merged 6 commits into from
Jul 15, 2024

Merge branch 'main' into fix-auth-apm-tracer-config-from-elastic-agent

16bdd08
Select commit
Loading
Failed to load commit list.
Merged

Add additional config remapping for "api_key" and "secret_token" for libbeat instrumentation wrapper #13691

Merge branch 'main' into fix-auth-apm-tracer-config-from-elastic-agent
16bdd08
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Jul 15, 2024 in 2s

2 rules match and 22 potential rules

⚠️ The pull request has been merged by @1pkg

Rule: ask to resolve conflict (comment)

  • conflict

Rule: backport patches to 8.4 branch (backport)

  • label=backport-8.4
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.3 branch (backport)

  • label=backport-8.3
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.2 branch (backport)

  • label=backport-8.2
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.1 branch (backport)

  • label=backport-8.1
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.0 branch (backport)

  • label=backport-8.0
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 7.17 branch (backport)

  • label=backport-7.17
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 7.16 branch (backport)

  • label=backport-7.16
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 7.15 branch (backport)

  • label=backport-7.15
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 7.14 branch (backport)

  • label=backport-7.14
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 7.13 branch (backport)

  • label=backport-7.13
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: notify the backport policy (comment, label)

  • -label~=^backport
  • base=main

✅ Rule: remove backport-skip label (label)

  • label~=^backport-\d

Rule: backport patches to 8.5 branch (backport)

  • label=backport-8.5
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.6 branch (backport)

  • label=backport-8.6
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.7 branch (backport)

  • label=backport-8.7
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.8 branch (backport)

  • label=backport-8.8
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.9 branch (backport)

  • label=backport-8.9
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.10 branch (backport)

  • label=backport-8.10
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.11 branch (backport)

  • label=backport-8.11
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.12 branch (backport)

  • label=backport-8.12
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.13 branch (backport)

  • label=backport-8.13
  • base=main
  • merged
  • merged [📌 backport requirement]

Rule: backport patches to 8.14 branch (backport)

  • label=backport-8.14
  • base=main
  • merged
  • merged [📌 backport requirement]

✅ Rule: backport patches to 8.15 branch (backport)

  • base=main
  • label=backport-8.15
  • 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!


4 not applicable rules

Rule: squash and merge updatecli PRs after CI passes (queue)

  • head~=^updatecli
  • label=automation
  • -conflict
  • -draft [📌 queue requirement]
  • 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]
      • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
      • #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=system-test
        • check-neutral=system-test
        • check-skipped=system-test
      • any of: [🛡 GitHub branch protection]
        • check-success=lint
        • check-neutral=lint
        • check-skipped=lint
      • any of: [🛡 GitHub branch protection]
        • check-success=buildkite/docs-build-pr
        • check-neutral=buildkite/docs-build-pr
        • check-skipped=buildkite/docs-build-pr

Rule: delete updatecli branch after merging/closing it (delete_head_branch)

  • all of:
    • head~=^updatecli
    • label=automation
  • closed [📌 delete_head_branch requirement]
  • any of:
    • closed
    • merged

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

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

Rule: squash and merge backport PRs after CI passes (queue)

  • author=mergify[bot]
  • label=backport
  • -conflict
  • -draft [📌 queue requirement]
  • 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]
      • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
      • #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=system-test
        • check-neutral=system-test
        • check-skipped=system-test
      • any of: [🛡 GitHub branch protection]
        • check-success=lint
        • check-neutral=lint
        • check-skipped=lint
      • any of: [🛡 GitHub branch protection]
        • check-success=buildkite/docs-build-pr
        • check-neutral=buildkite/docs-build-pr
        • check-skipped=buildkite/docs-build-pr
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