[9.0] Revert "Dependency: Update to Prometheus 0.300.* (#36873)" #3
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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, howevermake -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.