Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream Prometheus at c5040c5 #655

Merged
merged 23 commits into from
Jun 27, 2024
Merged

Commits on Jan 31, 2024

  1. storage: don't wrap single querier in merge-queriers

    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>
    bboreham committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    fbca054 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. [ENHANCEMENT] PromQL: use Kahan summation for sum()

    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>
    bboreham committed May 9, 2024
    Configuration menu
    Copy the full SHA
    ea82b49 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. discovery: aws: expose Primary IPv6 addresses as label, partially fix…

    …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>
    akunszt and machine424 authored Jun 20, 2024
    Configuration menu
    Copy the full SHA
    2aaf99d View commit details
    Browse the repository at this point in the history
  2. Fix @goyacc invocation (#14324)

    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>
    prymitive authored Jun 20, 2024
    Configuration menu
    Copy the full SHA
    dbd29df View commit details
    Browse the repository at this point in the history
  3. queue_manager: add histogram info to error logs (#14326)

    Signed-off-by: Piotr Gwizdala <17101802+thampiotr@users.noreply.github.com>
    thampiotr authored Jun 20, 2024
    Configuration menu
    Copy the full SHA
    d782533 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. rebase main and adjust the configuration

    Signed-off-by: ouyang1204@gmail.com <ouyang1204@gmail.com>
    DrAuYueng committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    0d25931 View commit details
    Browse the repository at this point in the history
  2. Fix data corruption in remote write if max_sample_age is applied (#14…

    …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>
    3 people authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    00b110c View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Merge pull request #14074 from bboreham/kahan-sum-sum

    [ENHANCEMENT] PromQL: use Kahan summation for sum()
    bboreham authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    b6aba4f View commit details
    Browse the repository at this point in the history
  2. Merge branch 'main' into elide-queriers

    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    6030407 View commit details
    Browse the repository at this point in the history
  3. Fix various linting errors

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    aknuds1 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    d902116 View commit details
    Browse the repository at this point in the history
  4. golangci-lint: Upgrade to v1.59.1

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    aknuds1 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    0395b04 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Fix issue where pending OOO read can be left dangling if creating que…

    …rier fails
    
    Signed-off-by: Charles Korn <charles.korn@grafana.com>
    charleskorn committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    2c5e887 View commit details
    Browse the repository at this point in the history
  2. tsdb: expose hook to customize block querier (#14114)

    * 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>
    yeya24 authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    5585a3c View commit details
    Browse the repository at this point in the history
  3. TSDB: Change block populator to accept postings index function (#14213)

    Signed-off-by: Ben Ye <benye@amazon.com>
    yeya24 authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    246b7c6 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #14341 from charleskorn/charleskorn/cleanup-pendin…

    …g-read
    
    Fix issue where pending OOO read can be left dangling if creating querier fails
    bboreham authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    348f7f8 View commit details
    Browse the repository at this point in the history
  5. remote write handler: reject samples with future timestamps (#14304)

    * 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>
    jkroepke and bboreham authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    9935544 View commit details
    Browse the repository at this point in the history
  6. Bump go-retryablehttp to fix basic auth creds leak

    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>
    danielmellado authored and machine424 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    1b5f650 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #14340 from aknuds1/arve/fix-lint

    Upgrade to golangci-lint v1.59.1, fix errors
    aknuds1 authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    1abeeba View commit details
    Browse the repository at this point in the history
  8. Merge pull request #13434 from bboreham/elide-queriers

    storage: don't wrap single querier in merge-queriers
    bboreham authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    f24ce00 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. notifier: optionally drain queued notifications before shutting down …

    …(#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>
    charleskorn authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    2dd07fb View commit details
    Browse the repository at this point in the history
  2. Merge pull request #10490 from DrAuYueng/fix-docker-sd-service-missing

    [ENHANCEMENT] Docker SD: add MatchFirstNetwork for containers with multiple networks
    
    Fixes docker sd service misssing in shared mode and deduplicate targets by network
    bboreham authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    c5040c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge remote-tracking branch 'upstream/main' into charleskorn/upgrade…

    …-prometheus
    
    # Conflicts:
    #	.github/workflows/ci.yml
    #	tsdb/compact.go
    #	tsdb/compact_test.go
    #	tsdb/db.go
    #	tsdb/db_test.go
    charleskorn committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    2b27fcb View commit details
    Browse the repository at this point in the history
  2. Bump golangci-lint version

    Signed-off-by: Charles Korn <charles.korn@grafana.com>
    charleskorn committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    ab6bd47 View commit details
    Browse the repository at this point in the history