Skip to content

Conversation

@ishleenk17
Copy link
Member

@ishleenk17 ishleenk17 commented Mar 27, 2025

Update the Prometheus library to v0.300.1

Relates: #42916

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 27, 2025
@mergify
Copy link
Contributor

mergify bot commented Mar 27, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ishleenk17? 🙏.
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
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@mergify
Copy link
Contributor

mergify bot commented Apr 15, 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 prometheus_300 upstream/prometheus_300
git merge upstream/main
git push upstream prometheus_300

@ishleenk17 ishleenk17 marked this pull request as ready for review April 21, 2025 04:51
@ishleenk17 ishleenk17 requested a review from a team as a code owner April 21, 2025 04:51
@ishleenk17
Copy link
Member Author

Does this need a changelog entry?

Added changelog. Thanks

@pierrehilbert pierrehilbert requested a review from rdner April 22, 2025 12:48
Copy link
Member

@rdner rdner left a comment

Choose a reason for hiding this comment

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

Looks good to me, have only one question.

@ishleenk17 ishleenk17 merged commit 6fd1224 into elastic:main Apr 23, 2025
190 checks passed
@cmacknz
Copy link
Member

cmacknz commented Apr 23, 2025

Thanks! Should this also be backported to 8.19? I have a suspicion we won't be able to go for the entire LTS life time of that branch without needing to update this dependency because of a security update :)

@ishleenk17 ishleenk17 added the backport-8.19 Automated backport to the 8.19 branch label Apr 23, 2025
mergify bot pushed a commit that referenced this pull request Apr 23, 2025
* Update Prometheus library

* Update NOTICE

* Update the default contenttype in testdata

* Resolve linter errors

* Resolve linter errors

* lint error

* adding files for remotewrite prom3

Signed-off-by: Andreas Gkizas <[email protected]>

* adding files for remotewrite prom3

Signed-off-by: Andreas Gkizas <[email protected]>

* Add comment

* Update go mod

* Add default port in URL parsing

* Add URL tests

* Resolve linter errors

* Update TestNewLeaderElectionManager flaky test

* Fix linter errors

* Update metricbeat/mb/parse/url.go

Co-authored-by: Aman <[email protected]>

* Update url.go

* update err

* CI error

* log update

* upfdate defaultPort

* update changelog

* Update metricbeat/helper/prometheus/textparse.go

Co-authored-by: Aman <[email protected]>

* Update metricbeat/mb/parse/url.go

Co-authored-by: Aman <[email protected]>

---------

Signed-off-by: Andreas Gkizas <[email protected]>
Co-authored-by: Andreas Gkizas <[email protected]>
Co-authored-by: Michalis Katsoulis <[email protected]>
Co-authored-by: Aman <[email protected]>
(cherry picked from commit 6fd1224)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@ishleenk17
Copy link
Member Author

Thanks! Should this also be backported to 8.19? I have a suspicion we won't be able to go for the entire LTS life time of that branch without needing to update this dependency because of a security update :)

This has been backported to 8.19.

@cmacknz
Copy link
Member

cmacknz commented Apr 30, 2025

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.19 Automated backport to the 8.19 branch Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants