Aos bump v2.14.0#40
Merged
openshift-merge-robot merged 107 commits intoopenshift:masterfrom Nov 14, 2019
Merged
Conversation
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
…eturn-code-when-disabled Fix management api return code when lifecycle API is disabled
Signed-off-by: chentanjun <2799194073@qq.com>
fix typo Signed-off-by: abejidefemi1@gmail.com <abejidefemi1@gmail.com>
…-mark Fix punctuation mark
…eus#6084) * Added Fatal method and used it in buffer_test Signed-off-by: Joe Elliott <number101010@gmail.com> * Added period to meet contributing guidelines Signed-off-by: Joe Elliott <number101010@gmail.com> * Removed fatal testutil method. Refactored test cases to use testutil.Assert Signed-off-by: Joe Elliott <number101010@gmail.com> * Added if found condition for clarity Signed-off-by: Joe Elliott <number101010@gmail.com>
Add the tsdb tool to promu so that it's included in the release tarballs. Signed-off-by: Ben Kochie <superq@gmail.com>
* Benchmark for loading WAL Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in> * Add more cases Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Kyle Hinton <kyle.hinton0@gmail.com>
….go (prometheus#6097) * Replaced test validations with testutils on storage/remote/codec_test.go Signed-off-by: George Felix <george.felix@ubeeqo.com> * gofmt Signed-off-by: George Felix <george.felix@ubeeqo.com> * Removed shouldPass assertion Signed-off-by: George Felix <gfelixc@gmail.com> * Fixes to improve readability Signed-off-by: George Felix <george.felix@ubeeqo.com> * Fixes based on code review comments Signed-off-by: George Felix <george.felix@ubeeqo.com>
The WAL Watcher replays a checkpoint after it is created in order to garbage collect series that no longer exist in the WAL. Currently the garbage collection process is done serially with reading from the tip of the WAL which can cause large delays in writing samples to remote storage just after compaction occurs. This also fixes a memory leak where dropped series are not cleaned up as part of the SeriesReset process. Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
- Use testutil.ToFloat64 to collect testing metrics - Declare ServiceDiscoveryConfig directly instead of calling Unmarshal on a piece of YAML Signed-off-by: Nevill <nevill.dutt@gmail.com>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
…async Garbage collect asynchronously in the WAL Watcher
Refactor on discovery/manager_test.go
…6113) Signed-off-by: Callum Styan <callumstyan@gmail.com>
* web/ui: handle null case
The call might sometimes return /api/v1/label/__name__/values the
following:
```
{"status":"success","data":null}
```
Then the `index.js` file assumes that `data` is not `null`. However,
that assumption fails and then we get this error in the console:
```
graph.js?v=foo:317 Uncaught TypeError: Cannot read property 'length' of null
at Object.success (graph.js?v=foo:317)
...
```
Then it becomes impossible to, for example, send a simple query like
`time()` and graph the results.
Fix it by using an empty array as the result if it is `null`.
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
* ui: update static assets data
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Signed-off-by: tanjunchen <2799194073@qq.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…gs-on-cancel discovery: don't log errors on context cancelation
Signed-off-by: Callum Styan <callumstyan@gmail.com>
* promql: Move tests to testutil Signed-off-by: Alex Dzyoba <alex@dzyoba.com> * promql: Match error type via errors.As in tests Signed-off-by: Alex Dzyoba <alex@dzyoba.com> * promql: Remove unused `expectedList` func from lex_test.go Signed-off-by: Alex Dzyoba <alex@dzyoba.com>
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
Correct spelling mistakes
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
* Adding TSDB Head Stats like cardinality to Status Page Signed-off-by: Sharad Gaur <sgaur@splunk.com> * Moving mutx to Head Signed-off-by: Sharad Gaur <sgaur@splunk.com> * Renaming variabls Signed-off-by: Sharad Gaur <sgaur@splunk.com> * Renaming variabls and html Signed-off-by: Sharad Gaur <sgaur@splunk.com> * Removing unwanted whitespaces Signed-off-by: Sharad Gaur <sgaur@splunk.com> * Adding Tests, Banchmarks and Max Heap for Postings Stats Signed-off-by: Sharad Gaur <sgaur@splunk.com> * Adding more tests for postingstats and web handler Signed-off-by: Sharad Gaur <sgaur@splunk.com> * Adding more tests for postingstats and web handler Signed-off-by: Sharad Gaur <sgaur@splunk.com> * Remove generated asset file that is no longer used Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com> * Changing comment and variable name for more readability Signed-off-by: Sharad Gaur <sgaur@splunk.com> * Using time.Duration in postings status function and removing refresh button from web page Signed-off-by: Sharad Gaur <sgaur@splunk.com>
prometheus#6193 removed these icons from the font library, but the non-React timepicker library requires these. Signed-off-by: Julius Volz <julius.volz@gmail.com>
Alert rules do not use the Record field, so any alerts with the same labels and different names would be counted as being duplicates. Promtool will now consider either field when finding duplicates. Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
Signed-off-by: David Leadbeater <dgl@dgl.cx>
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
Author
|
Given the UI changes, I'll check the PR with cluster-bot. |
Author
|
/hold |
|
Bug and performance improvements are generally desirable for us though so if you confirm via cluster bot, I’m happy with this. /lgtm |
v2.14.0 Signed-off-by: Simon Pasquier <spasquie@redhat.com>
1f53325 to
da2ad2b
Compare
Author
|
It's ok now: ping @pgier @s-urbaniak for approval |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: brancz, s-urbaniak, 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 |
Author
|
/unhold |
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
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.

Prometheus v2.14.0 introdues a new ReactJS UI (still experimental but accessible from the main UI). This complicates a bit the build process for 2 reasons:
yarninstalled and they can't download packages from the outside.make common-buildinstead ofmake build..promu.ymldoesn't support space-separated build tags (see Parameter / flag parsing from YAML does not remove quotes around quoted arguments prometheus/promu#172) and comma-separated build tags are only supported starting with Go 1.13builtinassetstag intoondiskassets. As soon as the OpenShift build pipeline supports Go 1.13, this can be reverted.