-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Fix prometheus imports to match OTel #41014
Conversation
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
This pull request does not have a backport label.
To fixup this pull request, you need to add the backport labels for the needed
|
|
The docker update to v27 might require some additional changes https://docs.docker.com/engine/release-notes/27/#go-sdk-changes |
go.mod
Outdated
@@ -57,7 +57,7 @@ require ( | |||
github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2 | |||
github.com/dgraph-io/badger/v3 v3.2103.1 | |||
github.com/digitalocean/go-libvirt v0.0.0-20240709142323-d8406205c752 | |||
github.com/docker/docker v26.1.5+incompatible | |||
github.com/docker/docker v27.0.3+incompatible |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From GHSA-v23v-6jw2-98fq this has a vulnerability we need to avoid, think we'd need to go to v27.1.1+ to avoid it as there's no v27.0.4 for whatever reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't actually affect us but the CVSS is 10/10 so we do not want it showing up in CVE scans of Beats regardless.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cmacknz I updated it to v27.3.1+incompatible.
Any reason why there are a lot of deps out of date? Doesn't dependabot keep deps up to date for us?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dependabot only auto-updates for github.com/elastic dependencies, for non-elastic dependencies it only suggests updates to remove CVEs.
We could turn on dependabot for everything, but that'd be a lot of PRs to keep up with.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This pull request is now in conflicts. Could you fix it? 🙏
|
@elastic/obs-cloudnative-monitoring Could I get a review on this PR? |
This pull request is now in conflicts. Could you fix it? 🙏
|
6b52816
to
58a4ea6
Compare
(cherry picked from commit 1e94259)
Proposed commit message
Fixes our prometheus go.mod imports to match what prometheus upstream recommends for how to use it as a library.
This aligns our imports to match the OTel collector distribution which prevents the collisions of prometheus modules.
Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files[ ] I have added an entry in(not user facing)CHANGELOG.next.asciidoc
orCHANGELOG-developer.next.asciidoc
.Disruptive User Impact
None