Skip to content

Conversation

@blakerouse
Copy link
Contributor

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

  • 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 (test exists)
  • [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc. (not user facing)

Disruptive User Impact

None

@blakerouse blakerouse added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Sep 26, 2024
@blakerouse blakerouse self-assigned this Sep 26, 2024
@blakerouse blakerouse requested review from a team as code owners September 26, 2024 16:14
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@botelastic botelastic bot added 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 Sep 26, 2024
@mergify
Copy link
Contributor

mergify bot commented Sep 26, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @blakerouse? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

@mergify
Copy link
Contributor

mergify bot commented Sep 26, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 26, 2024
@mauri870
Copy link
Member

The docker update to v27 might require some additional changes https://docs.docker.com/engine/release-notes/27/#go-sdk-changes

go.mod Outdated
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
Copy link
Member

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.

Copy link
Member

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.

Copy link
Contributor Author

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?

Copy link
Member

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cmacknz I didn't know that thanks for the explanation. It might be a lot, wonder if we could just get it to run like once a month with all deps in a single PR.

@pazone ^ would that be possible?

@mergify
Copy link
Contributor

mergify bot commented Sep 27, 2024

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 fix-prometheus-import upstream/fix-prometheus-import
git merge upstream/main
git push upstream fix-prometheus-import

@blakerouse
Copy link
Contributor Author

@elastic/obs-cloudnative-monitoring Could I get a review on this PR?

@mergify
Copy link
Contributor

mergify bot commented Sep 30, 2024

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 fix-prometheus-import upstream/fix-prometheus-import
git merge upstream/main
git push upstream fix-prometheus-import

@blakerouse blakerouse force-pushed the fix-prometheus-import branch from 6b52816 to 58a4ea6 Compare September 30, 2024 19:14
@blakerouse blakerouse enabled auto-merge (squash) September 30, 2024 19:17
@blakerouse blakerouse merged commit 1e94259 into elastic:main Sep 30, 2024
mergify bot pushed a commit that referenced this pull request Sep 30, 2024
blakerouse added a commit that referenced this pull request Oct 1, 2024
(cherry picked from commit 1e94259)

Co-authored-by: Blake Rouse <[email protected]>
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.x Automated backport to the 8.x branch with mergify Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants