Skip to content

[Heartbeat] Dedupe screenshots / Extra Args (backport #25808)#26192

Merged
andrewvc merged 3 commits into7.xfrom
mergify/bp/7.x/pr-25808
Jun 8, 2021
Merged

[Heartbeat] Dedupe screenshots / Extra Args (backport #25808)#26192
andrewvc merged 3 commits into7.xfrom
mergify/bp/7.x/pr-25808

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 8, 2021

This is an automatic backport of pull request #25808 done by Mergify.
Cherry-pick of db6738e has failed:

On branch mergify/bp/7.x/pr-25808
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit db6738eac.
  (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:   CHANGELOG.next.asciidoc
	modified:   heartbeat/docs/monitors/monitor-browser.asciidoc
	modified:   x-pack/heartbeat/monitors/browser/browser.go
	modified:   x-pack/heartbeat/monitors/browser/config.go
	new file:   x-pack/heartbeat/monitors/browser/suite.go
	deleted:    x-pack/heartbeat/monitors/browser/suite_runner.go
	renamed:    x-pack/heartbeat/monitors/browser/suite_runner_test.go -> x-pack/heartbeat/monitors/browser/suite_test.go
	modified:   x-pack/heartbeat/monitors/browser/synthexec/enrich.go
	modified:   x-pack/heartbeat/monitors/browser/synthexec/enrich_test.go
	modified:   x-pack/heartbeat/monitors/browser/synthexec/synthexec.go
	modified:   x-pack/heartbeat/monitors/browser/synthexec/synthtypes.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   heartbeat/_meta/fields.common.yml
	both modified:   heartbeat/docs/fields.asciidoc
	both modified:   heartbeat/include/fields.go
	both modified:   x-pack/heartbeat/include/fields.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

@andrewvc
[Heartbeat] Dedupe screenshots / Extra Args (#25808)
ccdbd00 
(cherry picked from commit db6738e)

# Conflicts:
#	heartbeat/_meta/fields.common.yml
#	heartbeat/docs/fields.asciidoc
#	heartbeat/include/fields.go
#	x-pack/heartbeat/include/fields.go
@mergify mergify bot requested a review from a team as a code owner June 8, 2021 03:56
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 8, 2021
@mergify mergify bot mentioned this pull request Jun 8, 2021
Merged
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 8, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 8, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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 #26192 updated

  • Start Time: 2021-06-08T15:26:23.376+0000

  • Duration: 78 min 6 sec

  • Commit: d7ce508

Test stats 🧪

Test Results
Failed 0
Passed 3348
Skipped 82
Total 3430

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 3348
Skipped 82
Total 3430

@andrewvc andrewvc self-assigned this Jun 8, 2021
@andrewvc andrewvc added Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Jun 8, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 8, 2021

Pinging @elastic/uptime (Team:Uptime)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 8, 2021
@andrewvc andrewvc added needs_team Indicates that the issue/PR needs a Team:* label v7.14.0 labels Jun 8, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 8, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Jun 8, 2021

This pull request doesn't have a Team:<team> label.

@andrewvc andrewvc merged commit 35d41be into 7.x Jun 8, 2021
@andrewvc andrewvc deleted the mergify/bp/7.x/pr-25808 branch June 8, 2021 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@andrewvc andrewvc

Labels

conflicts There is a conflict in the backported pull request Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team v7.14.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @andrewvc