[8.1](backport #29710) use main default branch by mergify[bot] · Pull Request #30278 · elastic/beats

mergify · 2022-02-08T14:41:58Z

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

On branch mergify/bp/8.1/pr-29710
Your branch is up to date with 'origin/8.1'.

You are currently cherry-picking commit 237937085a.
  (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:   .ci/apm-beats-update.groovy
	modified:   .ci/beats-tester-bc.groovy
	modified:   .ci/beats-tester.groovy
	modified:   .ci/build-docker-images.groovy
	modified:   .ci/jobs/apm-beats-update.yml
	modified:   .ci/jobs/beats-schedule-daily.yml
	modified:   .ci/jobs/beats-schedule-weekly.yml
	modified:   .ci/jobs/beats-test-infra.yml
	modified:   .ci/jobs/beats-tester-bc.yml
	modified:   .ci/jobs/beats-tester.yml
	modified:   .ci/jobs/beats.yml
	modified:   .ci/jobs/build-it-docker-images.yml
	modified:   .ci/jobs/packaging.yml
	modified:   .ci/packer_cache.sh
	modified:   .ci/schedule-daily.groovy
	modified:   .ci/schedule-weekly.groovy
	modified:   .mergify.yml
	modified:   CHANGELOG-developer.asciidoc
	modified:   CHANGELOG-developer.next.asciidoc
	modified:   CHANGELOG.next.asciidoc
	modified:   Jenkinsfile
	modified:   dev-tools/cherrypick_pr
	modified:   dev-tools/merge_pr
	modified:   dev-tools/open_pr
	modified:   docs/devguide/contributing.asciidoc
	modified:   docs/devguide/create-metricset.asciidoc
	modified:   docs/devguide/metricset-details.asciidoc
	modified:   docs/devguide/migrate-dashboards.asciidoc
	modified:   filebeat/_meta/test/docs/testing.md
	modified:   libbeat/docs/communitybeats.asciidoc
	modified:   libbeat/docs/upgrading.asciidoc
	modified:   x-pack/elastic-agent/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

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.com

(cherry picked from commit 2379370) # Conflicts: # README.md

elasticmachine · 2022-02-08T18:06:52Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2022-03-03T12:05:43.941+0000
Duration: 107 min 34 sec

Test stats 🧪

Test	Results
Failed	0
Passed	23558
Skipped	2451
Total	26009

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.
/package : Generate the packages and run the E2E tests.
/beats-tester : Run the installation tests with beats-tester.
run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

README.md

mergify · 2022-02-09T15:00:49Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.1/pr-29710 upstream/mergify/bp/8.1/pr-29710
git merge upstream/8.1
git push upstream mergify/bp/8.1/pr-29710

mergify · 2022-02-14T05:40:11Z

This pull request has not been merged yet. Could you please review and merge it @v1v? 🙏

v1v · 2022-02-14T18:37:55Z

/test

mergify · 2022-02-21T05:32:27Z

This pull request has not been merged yet. Could you please review and merge it @v1v? 🙏

v1v · 2022-02-21T13:21:57Z

/test

v1v · 2022-02-22T21:43:18Z

/test

mergify · 2022-02-28T05:42:29Z

This pull request has not been merged yet. Could you please review and merge it @v1v? 🙏

v1v · 2022-03-01T13:57:13Z

/test

mergify · 2022-03-01T19:25:06Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.1/pr-29710 upstream/mergify/bp/8.1/pr-29710
git merge upstream/8.1
git push upstream mergify/bp/8.1/pr-29710

…-29710 * '8.1' of github.com:elastic/beats: (51 commits) refactor pushDockerImages (#30414) (#30624) ci: add windows-2022 in the extended meta-stage (#30528) (#30630) Curate k8s testing versions to only keep the actively maintained (#30619) (#30625) [8.1](backport #30355) Add Beats upgrade docs for 8.0 (#30612) Remove references to gcp from the Functionbeat docs (#30579) (#30609) x-pack/auditbeat/module/system/socket: defend against exec with zero arguments (#30586) (#30597) [MySQL Enterprise] Adding default paths values to manifest.yml (#30598) (#30604) metricbeat - fix elasticsearch and kibana integration tests failures in 8.0 (#30566) (#30594) Install gawk as a replacement for mawk in Docker containers. (#30452) (#30465) [Filebeat] Remove RecordedFuture dataset from Threat Intel module (#30564) (#30568) Adjust the documentation of `backoff` options in filestream input (#30552) (#30557) packetbeat/beater: help the GC clean up the Npcap installer if it's not used (#30513) (#30546) Osquerybeat: Add install verification for osquerybeat (#30388) (#30404) Update docker/distribution to 2.8.0 (#30462) (#30540) Add `parsers` examples to `filestream` reference configuration (#30529) (#30537) [8.1](backport #30068) ZooKeeper module: Adapt to ZooKeeper 3.6+ `mntr` response fields' changes. (#30360) [8.1](backport #30512) Switch skip to use `CI` (#30525) Forward-port 8.0.1 changelog to 8.1 (#30517) packetbeat/beater: don't attempt to install npcap when already installed (#30509) (#30511) Add drop and explicit tests to avoid duplicate ingest of elasticsearch logs (#30440) (#30488) ...

v1v · 2022-03-03T12:05:05Z

/test

v1v · 2022-03-03T18:42:25Z

/package

use main default branch (#29710)

fd6021f

(cherry picked from commit 2379370) # Conflicts: # README.md

mergify bot requested a review from a team as a code owner February 8, 2022 14:41

mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 8, 2022

mergify bot assigned v1v Feb 8, 2022

botelastic bot added Team:Automation Label for the Observability productivity team needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Feb 8, 2022

v1v reviewed Feb 9, 2022

View reviewed changes

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

Apply suggestions from code review

70bec1b

Merge branch '8.1' into mergify/bp/8.1/pr-29710

dd1a425

v1v removed the conflicts There is a conflict in the backported pull request label Feb 22, 2022

v1v merged commit 9bd4832 into 8.1 Mar 3, 2022

mergify bot deleted the mergify/bp/8.1/pr-29710 branch March 3, 2022 18:43

Conversation

mergify bot commented Feb 8, 2022 • edited by zube bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elasticmachine commented Feb 8, 2022 • edited by jenkins-beats-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mergify bot commented Feb 9, 2022

Uh oh!

mergify bot commented Feb 14, 2022

Uh oh!

v1v commented Feb 14, 2022

Uh oh!

mergify bot commented Feb 21, 2022

Uh oh!

v1v commented Feb 21, 2022

Uh oh!

v1v commented Feb 22, 2022

Uh oh!

mergify bot commented Feb 28, 2022

Uh oh!

v1v commented Mar 1, 2022

Uh oh!

mergify bot commented Mar 1, 2022

Uh oh!

v1v commented Mar 3, 2022

Uh oh!

v1v commented Mar 3, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mergify bot commented Feb 8, 2022 •

edited by zube bot

Loading

elasticmachine commented Feb 8, 2022 •

edited by jenkins-beats-ci bot

Loading