Merged
Conversation
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Useful when multiple (tagged) addresses for a node are exposed on the catalog API Ref. https://www.consul.io/api/catalog.html#taggedaddresses Signed-off-by: Samuel Alfageme <samuel@alfage.me>
Signed-off-by: SenXuDC <sen.xu@daocloud.io>
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
Signed-off-by: Thomas J. Fox <thomasjfox1@gmail.com>
Signed-off-by: Julius Volz <julius.volz@gmail.com>
…om/prometheus/prometheus/notifier', changed to 'notifierManager'. (prometheus#4947) Signed-off-by: aixeshunter <aixeshunter@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…of using a slice) for BufferedSeriesIterator, to reduce the variance of benchmark results due to memory pressure. (prometheus#4847) Signed-off-by: Alin Sinpalean <alin.sinpalean@gmail.com>
…les falling outside of the new delta from the underlying sampleRing, when ReduceDelta is called. (prometheus#4849) Signed-off-by: Alin Sinpalean <alin.sinpalean@gmail.com>
Adapted top dir relabel to use pkg relabel structs. Removal of this in a separate tracked here: prometheus#3647 Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
…s#5006) Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com> Signed-off-by: tariqibrahim <tariq181290@gmail.com>
Signed-off-by: Paul Gier <pgier@redhat.com>
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
Signed-off-by: aixeshunter <aixeshunter@gmail.com>
prometheus#4590) Signed-off-by: Marcel Juhnke <marrat@marrat.de>
Adds checks for current OS and arch to determine whether the '-race' option should be used with go test Signed-off-by: Paul Gier <pgier@redhat.com>
Signed-off-by: aixeshunter <aixeshunter@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…ackground() (prometheus#5024) * vendor update * discovery/gce: oauth2.NoContext is deprecated, replace with context.Background() Signed-off-by: Erik Hollensbe <github@hollensbe.org>
Signed-off-by: Ilya Gladyshev <ilya.v.gladyshev@gmail.com>
* update tsdb to v0.4.0 Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com> * remove unused struct field Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
* Add flag for size based retention Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com> * Deprecate the old retention flag for a new one. Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com> * Add ability to take a suffix for size flag Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com> * Address feedback Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Also sanitise the max block duration to max a month. Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Signed-off-by: Hrishikesh Barman <hrishikeshbman@gmail.com>
Fixes prometheus#5043 Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
v2.7.1 Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
openshift-ci-robot
added
approved
Author
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: pgier, simonpasquier The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
openshift-merge-bot bot
pushed a commit
that referenced
this pull request
Oct 9, 2025
When doing a config reload that need to stop some providers while also sending SIGTERM to Prometheus at the same time can sometimes hang
1: sync.WaitGroup.Wait [83 minutes] [Created by run.(*Group).Run in goroutine 1 @ group.go:37]
sync sema.go:110 runtime_SemacquireWaitGroup(*uint32(#166))
sync waitgroup.go:118 (*WaitGroup).Wait(*WaitGroup(#23))
discovery manager.go:276 (*Manager).ApplyConfig(#23, #167)
main main.go:964 main.func5(#120)
main main.go:1505 reloadConfig({#183, 0x1b}, 1, #40, #43, #50, {#31, 0xa, 0})
main main.go:1182 main.func22()
run group.go:38 (*Group).Run.func1(*Group(#26), #51)
Add a test for it.
Signed-off-by: Lukasz Mierzwa <l.mierzwa@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Branch comparison between the upstream v2.7.1 tag and this PR:
prometheus/prometheus@v2.7.1...simonpasquier:aos-bump-v2.7.1
This includes prometheus#5163
cc @brancz