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

[7.17](backport #36969) Update to elastic-agent-libs v0.6.2. #36979

Merged
merged 5 commits into from Oct 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 27, 2023

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

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

You are currently cherry-picking commit ae11b47ef3.
  (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:   x-pack/filebeat/module/squid/log/test/access1.log-expected.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

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

* Update to elastic-agent-libs v0.6.2.

Increases the version of golang.org/x/net to one that has the HTTP2
rapid reset fix.

* Add changelog entry.

* Updates for latest version of golang.org/x/net/publicsuffix

* Update all remaining subdomains

(cherry picked from commit ae11b47)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested review from a team as code owners October 27, 2023 17:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 27, 2023
@mergify mergify bot requested review from ycombinator and rdner and removed request for a team October 27, 2023 17:14
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 27, 2023
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 27, 2023

💚 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

  • Duration: 146 min 21 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@cmacknz
Copy link
Member

cmacknz commented Oct 27, 2023

/test libbeat-shipping-to-next-major

Pull in change from #36257 that was
not backported.
@cmacknz cmacknz enabled auto-merge (squash) October 27, 2023 21:59
@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Oct 29, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 29, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 30, 2023

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

@rdner rdner requested review from cmacknz and removed request for rdner October 30, 2023 11:19
andrewkroh
andrewkroh previously approved these changes Oct 30, 2023
@andrewkroh andrewkroh dismissed their stale review October 30, 2023 15:32

It looks like the Windows event test golden files need an update.

@andrewkroh
Copy link
Member

On Windows, I think the commands to update those domains in golden files are

cd x-pack/winlogbeat/module 
go test ./... -update

@cmacknz cmacknz merged commit 2a02e74 into 7.17 Oct 30, 2023
113 checks passed
@cmacknz cmacknz deleted the mergify/bp/7.17/pr-36969 branch October 30, 2023 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants