Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 23, 2025

Update the Prometheus library to v0.300.1

Relates: #42916


This is an automatic backport of pull request #43540 done by Mergify.

* 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
@mergify mergify bot requested review from a team as code owners April 23, 2025 17:28
@mergify mergify bot added the backport label Apr 23, 2025
@mergify mergify bot requested a review from a team as a code owner April 23, 2025 17:28
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Apr 23, 2025
@mergify mergify bot requested review from faec and mauri870 and removed request for a team April 23, 2025 17:28
@mergify
Copy link
Contributor Author

mergify bot commented Apr 23, 2025

Cherry-pick of 6fd1224 has failed:

On branch mergify/bp/8.19/pr-43540
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 6fd122401.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   libbeat/autodiscover/providers/kubernetes/kubernetes_test.go
	modified:   metricbeat/helper/prometheus/textparse.go
	modified:   metricbeat/mb/parse/url.go
	modified:   metricbeat/mb/parse/url_test.go
	modified:   metricbeat/mb/testing/testdata.go
	modified:   metricbeat/module/prometheus/query/query.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested review from blakerouse and michalpristas and removed request for a team April 23, 2025 17:28
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 23, 2025
@github-actions github-actions bot added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Apr 23, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 23, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Apr 28, 2025

This pull request has not been merged yet. Could you please review and merge it @ishleenk17? 🙏

@devamanv devamanv assigned devamanv and unassigned ishleenk17 Apr 29, 2025
@devamanv devamanv merged commit c2728b0 into 8.19 Apr 30, 2025
193 checks passed
@devamanv devamanv deleted the mergify/bp/8.19/pr-43540 branch April 30, 2025 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request 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.

5 participants