Merge upstream Prometheus at c5040c5 #655
Merged
Conversation
This file contains 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
If given a single querier, just return it instead of constructing a complicated wrapper. The code in `mergeGenericQuerier` which skipped merging when there was only one is not needed any more. This change required a few tests to be tweaked, because they relied on the specific behaviour of `mergeGenericQuerier.Select()`. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
This can give a more precise result, by keeping a separate running compensation value to accumulate small errors. See https://en.wikipedia.org/wiki/Kahan_summation_algorithm Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
…es #7406 (#14156) * discovery: aws: expose Primary IPv6 addresses as label Add __meta_ec2_primary_ipv6_addresses label. This label contains the Primary IPv6 address for every ENI attached to the EC2 instance. It is ordered by the DeviceIndex and the missing elements (interface without Primary IPv6 address) are kept in the list. --------- Signed-off-by: Arpad Kunszt <akunszt@hiya.com> Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>
goyacc is installed using 'install-goyacc' and ends up in GOPATH/bin. GOPATH isn't usually part of standard PATH, so when make tries to run goyacc it fails, unless PATH includes GOPATH/bin. Other Go tools, like golangci-lint, are also installed via go install into GOPATH/bin but they run correctly because make invocations for them use FIRST_GOPATH viriable to use full path. Call goyacc using FIRST_GOPATH/bin as well so it works without GOPATH being included in PATH. Signed-off-by: Lukasz Mierzwa <lukasz@cloudflare.com>
Signed-off-by: Piotr Gwizdala <17101802+thampiotr@users.noreply.github.com>
Signed-off-by: ouyang1204@gmail.com <ouyang1204@gmail.com>
…078) * fix: try to reproduce the bug from prometheus/prometheus#13979 in a test case Signed-off-by: David Vavra <sevenood@gmail.com> * fix: data corruption in remote write if max_sample_age is applied Signed-off-by: David Vavra <sevenood@gmail.com> * add benchmark for buildTimeSeries which does the filtering Signed-off-by: Callum Styan <callumstyan@gmail.com> --------- Signed-off-by: David Vavra <sevenood@gmail.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Co-authored-by: David Vavra <sevenood@gmail.com> Co-authored-by: Callum Styan <callumstyan@gmail.com>
[ENHANCEMENT] PromQL: use Kahan summation for sum()
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
…rier fails Signed-off-by: Charles Korn <charles.korn@grafana.com>
* expose hook for block querier Signed-off-by: Ben Ye <benye@amazon.com> * update comment Signed-off-by: Ben Ye <benye@amazon.com> * use defined type Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Ben Ye <benye@amazon.com>
…g-read Fix issue where pending OOO read can be left dangling if creating querier fails
* fix(remote_write): reject samples with future timestamps * increase check to +10 minutes to allow for clock drift --------- Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de> Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de> Signed-off-by: Jan-Otto Kröpke <github@jkroepke.de> Co-authored-by: Bryan Boreham <bjboreham@gmail.com>
This PR updates go-retryablehttp to version 0.7.7, even if it's used as an indirect import. Versions previous to that can didn't sanitize urls, discussed at HDCSEC-2024-12 [1] [1] https://discuss.hashicorp.com/t/hcsec-2024-12-go-retryablehttp-can-leak-basic-auth-credentials-to-log-files/68027 Signed-off-by: Daniel Mellado <dmellado@redhat.com>
Upgrade to golangci-lint v1.59.1, fix errors
storage: don't wrap single querier in merge-queriers
…(#14290) * Add draining of queued notifications to `notifier.Manager` Signed-off-by: Charles Korn <charles.korn@grafana.com> * Update docs Signed-off-by: Charles Korn <charles.korn@grafana.com> * Address PR feedback Signed-off-by: Charles Korn <charles.korn@grafana.com> * Add more logging Signed-off-by: Charles Korn <charles.korn@grafana.com> * Address offline feedback: remove timeout Signed-off-by: Charles Korn <charles.korn@grafana.com> * Ensure stopping takes priority over further processing, make tests more robust Signed-off-by: Charles Korn <charles.korn@grafana.com> * Make channel unbuffered Signed-off-by: Charles Korn <charles.korn@grafana.com> * Update docs Signed-off-by: Charles Korn <charles.korn@grafana.com> * Fix race in test Signed-off-by: Charles Korn <charles.korn@grafana.com> * Remove unnecessary context Signed-off-by: Charles Korn <charles.korn@grafana.com> * Make Stop safe to call multiple times Signed-off-by: Charles Korn <charles.korn@grafana.com> --------- Signed-off-by: Charles Korn <charles.korn@grafana.com>
[ENHANCEMENT] Docker SD: add MatchFirstNetwork for containers with multiple networks Fixes docker sd service misssing in shared mode and deduplicate targets by network
…-prometheus # Conflicts: # .github/workflows/ci.yml # tsdb/compact.go # tsdb/compact_test.go # tsdb/db.go # tsdb/db_test.go
Signed-off-by: Charles Korn <charles.korn@grafana.com>
|
|
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.
tsdb/compact.gofrom prometheus/prometheus#14213 carefully! I'm not familiar with this part of the codebase and I'm not 100% confident my changes are correct - we have diverged from the upstream implementation ofPopulateBlockin a few places.This PR merges the following changes from upstream:
Major changes
Performance improvements
Minor changes and refactoring
Bug fixes
Non-production changes
Not relevant to Mimir