Skip to content

[9.0] Revert "Dependency: Update to Prometheus 0.300.* (#36873)" #3

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

Merged
merged 1 commit into from
Mar 17, 2025

Conversation

cmacknz
Copy link
Member

@cmacknz cmacknz commented Mar 17, 2025

This reverts commit af6b17e.

Removes the update to Promtheus 0.300 from the v0.120.0 release of the upstream collector contrib repository.

This will be merged to a 9.0 branch in our fork (and an 8.18 branch created from the same point once this merges). This will let Elastic Agent's 9.0 and 8.18 branches include all other fixes from the v0.120.0 collector contrib release except this one.

Once this merges, I will create a tag that I intend to name v0.120.2-elastic to indicate this release does not exist upstream yet and is elastic specific so that we can more clearly see what we depend on upstream.

I have proven this fixes our dependency conflict in elastic/elastic-agent#7411 which replaces the upstream dependency with this branch in my fork.

For whatever reason, simply running make on my MacOS machine fails with what seems like unrelated errors, however make -C in each directory touched by af6b17e succeeds without issue.

The biggest thing I need help with is verifying I have not inadvertently broken anything without noticing it.

@cmacknz cmacknz self-assigned this Mar 17, 2025
Copy link

@swiatekm swiatekm left a comment

Choose a reason for hiding this comment

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

I ran the full unit test suite locally, as well as integration tests for Prometheus receiver. Everything passed, minus some tests which depend on the Github Actions runner environment (host metrics tests assume you have swap enabled on linux/amd64 for example). We should be safe merging this.

@cmacknz cmacknz merged commit 19cd4e8 into elastic:9.0 Mar 17, 2025
1 check passed
@cmacknz cmacknz deleted the 9.0-revert-prometheus-0.300 branch March 17, 2025 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants