Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 3, 2021

This is an automatic backport of pull request #6116 done by Mergify.
Cherry-pick of 31893d2 has failed:

On branch mergify/bp/7.x/pr-6116 Your branch is up to date with 'origin/7.x'. You are currently cherry-picking commit 31893d28. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed:	modified: apmpackage/apm/changelog.yml	modified: apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json	modified: apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json	modified: apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json	modified: apmpackage/apm/data_stream/internal_metrics/manifest.yml	modified: apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json	modified: apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/default.json	modified: apmpackage/apm/manifest.yml Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution)	deleted by us: changelogs/head.asciidoc 

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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/

Sort internal metrics by @timestamp, to speed up time range queries. (cherry picked from commit 31893d2) # Conflicts: #	changelogs/head.asciidoc
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 3, 2021
@mergify mergify bot assigned axw Sep 3, 2021
@axw axw removed the conflicts There is a conflict in the backported pull request label Sep 3, 2021
@axw axw enabled auto-merge (squash) September 3, 2021 08:18
@ghost
Copy link

ghost commented Sep 3, 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-09-03T08:18:17.605+0000

  • Duration: 43 min 16 sec

  • Commit: 8f33a61

Test stats 🧪

Test Results
Failed 0
Passed 4477
Skipped 15
Total 4492

Trends 🧪

Image of Build Times

Image of Tests

@axw axw merged commit 4b83c2a into 7.x Sep 3, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-6116 branch September 3, 2021 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants