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

[8.15](backport #5196) [pkg][fix] - Filter non-fatal errors and update go.mod #5261

Merged
merged 4 commits into from
Aug 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 6, 2024

What does this PR do?

With elastic/elastic-agent-system-metrics#164, we now also expect a list of non-fatal errors (access denied, operation not permitted, invalid parameters etc).
Such errors are safe to ignore, so update the tests
Also,

  • update go.mod

Why is it important?

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues


This is an automatic backport of pull request #5196 done by [Mergify](https://mergify.com).

* fix: update go.mod and test cases

* chore: update notice

* fix: go.mod

* fix: update notice

* fix: update notice, go.mod

* fix: update notice, go.mod

* fix: fix check

* fix: update notice, go.mod to v0.11.0

(cherry picked from commit a1fd2c9)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner August 6, 2024 18:38
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 6, 2024
@mergify mergify bot requested review from michalpristas and michel-laterman and removed request for a team August 6, 2024 18:38
Copy link
Contributor Author

mergify bot commented Aug 6, 2024

Cherry-pick of a1fd2c9 has failed:

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

You are currently cherry-picking commit a1fd2c9d9a.
  (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:   pkg/testing/fixture_install.go
	modified:   pkg/utils/watcher.go

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@VihasMakwana VihasMakwana self-requested a review August 6, 2024 18:47
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Aug 7, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@pierrehilbert pierrehilbert merged commit 0b814a4 into 8.15 Aug 9, 2024
14 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/8.15/pr-5196 branch August 9, 2024 12:54
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-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants