Skip to content

Conversation

@cmacknz
Copy link
Member

@cmacknz cmacknz commented Mar 13, 2025

This reverts #7023 and uses a replace directive pointed at the HEAD of the https://github.com/elastic/opentelemetry-collector-contrib/commits/9.0/ branch to allow us to downgrade prometheus to a version that Beats can support.

The 0.300 version of Prometheus introduces breaking changes that we do not have time to incorporate, at the same time we need the v0.120.0 version of the elasticsearch exporter.

elastic/opentelemetry-collector-contrib@19cd4e8 removing the 0.300 Prometheus dependency upgrade is the only commit in the fork above that is different from the upstream v0.120.0 release.

@mergify
Copy link
Contributor

mergify bot commented Mar 17, 2025

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 cmacknz/9.0-use-otel-contrib-fork upstream/cmacknz/9.0-use-otel-contrib-fork
git merge upstream/9.0
git push upstream cmacknz/9.0-use-otel-contrib-fork

@cmacknz cmacknz marked this pull request as ready for review March 17, 2025 20:55
@cmacknz cmacknz requested a review from a team as a code owner March 17, 2025 20:55
@elastic-sonarqube
Copy link

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @cmacknz

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Mar 18, 2025
@elasticmachine
Copy link
Contributor

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

@cmacknz cmacknz merged commit e0db952 into elastic:9.0 Mar 18, 2025
13 checks passed
@cmacknz cmacknz mentioned this pull request Mar 18, 2025
3 tasks
@cmacknz cmacknz deleted the cmacknz/9.0-use-otel-contrib-fork branch March 18, 2025 16:24
@mauri870 mauri870 mentioned this pull request Apr 1, 2025
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-changelog 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