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.

Sign up for GitHub

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

Jump to bottom

Upgrade to latest mimir-prometheus with Prometheus 3.0 changes #9844

Merged
merged 45 commits into from
Nov 27, 2024
Merged

Upgrade to latest mimir-prometheus with Prometheus 3.0 changes #9844

merged 45 commits into from
Nov 27, 2024

Commits on Nov 22, 2024

  1. Upgrade to latest mimir-prometheus@main 

    Signed-off-by: Arve Knudsen <[email protected]>

# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt
    @aknuds1 @charleskorn
    aknuds1 authored and charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    db74520 View commit details
    Browse the repository at this point in the history

  2. Sync test cases with upstream

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    af7b9b5 View commit details
    Browse the repository at this point in the history

  3. Adjust behaviour of range vector selectors and subqueries to match ne… 

    …w left-open behaviour in Prometheus 3
    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    4d320b6 View commit details
    Browse the repository at this point in the history

  4. Adjust TestRangeVectorSelectors and TestAnnotations to match new … 

    …left-open interval behaviour
    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    ee96f7e View commit details
    Browse the repository at this point in the history

  5. Disable unsupported upstream test cases

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    12e27b3 View commit details
    Browse the repository at this point in the history

  6. Update our test cases to reflect changes in Prometheus' behaviour

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    7176b57 View commit details
    Browse the repository at this point in the history

  7. Ensure point slice lengths are the same before comparing them

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    225a0c7 View commit details
    Browse the repository at this point in the history

  8. Emit "incompatible sample types" annotations for vector/vector binary… 

    … operations
    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    495b063 View commit details
    Browse the repository at this point in the history

  9. Emit "incompatible sample types" annotations for vector/scalar binary… 

    … operations
    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    29c2e48 View commit details
    Browse the repository at this point in the history

  10. Modify vector/scalar binary comparison operations to match Prometheus… 

    …' new behaviour
    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    7d5b9f9 View commit details
    Browse the repository at this point in the history

  11. Add extra test for subqueries

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    2ceae93 View commit details
    Browse the repository at this point in the history

  12. Bring in changes from prometheus/prometheus#15245

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    a90db6b View commit details
    Browse the repository at this point in the history

  13. Update tests to match new binary operations behaviour for native hist… 

    …ograms
    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    0049504 View commit details
    Browse the repository at this point in the history

  14. Bring in further changes from prometheus/prometheus#15413

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    305bf54 View commit details
    Browse the repository at this point in the history

  15. Change behaviour to mirror prometheus/prometheus#15245 

    Signed-off-by: Arve Knudsen <[email protected]>
    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    1375df3 View commit details
    Browse the repository at this point in the history

  16. Querier and query-frontend test changes for Prometheus 3 upgrade (#9959) 

    * Fix failing tests due to left-open range change

* Set lookback delta for `TestSplitQueryByInterval` test cases, and fix expectations to match left-open range change

* Update querier tests to match new behaviour
    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    7704ca1 View commit details
    Browse the repository at this point in the history

  17. Get left-open subquery fix 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1 @charleskorn
    aknuds1 authored and charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    cb33eac View commit details
    Browse the repository at this point in the history

  18. Sync upstream test cases

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    17e4b0b View commit details
    Browse the repository at this point in the history

  19. Update TestSubqueries to match expected behaviour 

    See prometheus/prometheus#15431 for details
    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    e6e3659 View commit details
    Browse the repository at this point in the history

  20. Address some of Josh's comments from #9948

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    7e60118 View commit details
    Browse the repository at this point in the history

  21. Address Josh's test-related comments from #9948

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    a4ae1eb View commit details
    Browse the repository at this point in the history

  22. Update integration tests to match new left-open range behaviour

    @charleskorn
    charleskorn committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    81f30a9 View commit details
    Browse the repository at this point in the history

  23. Merge remote-tracking branch 'origin/main' into arve/upgrade-mimir-pr… 

    …ometheus

Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    5e76708 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2024

  1. Fix integration test that relied on histogram + float producing a r… 

    …esult
    @charleskorn
    charleskorn committed Nov 24, 2024
    Configuration menu
    Copy the full SHA
    55b464b View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2024

  1. Use tjhop/slog-gokit 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    1d0ea03 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into arve/upgrade-mimir-pr… 

    …ometheus
    @aknuds1
    aknuds1 committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    a27617a View commit details
    Browse the repository at this point in the history

  3. Fix tests 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    f516678 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2024

  1. Merge remote-tracking branch 'origin/main' into arve/upgrade-mimir-pr… 

    …ometheus

Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    7873eda View commit details
    Browse the repository at this point in the history

  2. Fix possible result corruption for == and != with histograms

    @charleskorn
    charleskorn committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    5eaa734 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2024

  1. Merge remote-tracking branch 'origin/main' into arve/upgrade-mimir-pr… 

    …ometheus
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    5eed7da View commit details
    Browse the repository at this point in the history

  2. Define holt_winters alias within Mimir itself 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    687c249 View commit details
    Browse the repository at this point in the history

  3. Add changelog items 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    f09283e View commit details
    Browse the repository at this point in the history

  4. Disable UTF-8 metric/label names 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    60b2e3f View commit details
    Browse the repository at this point in the history

  5. Simplify logging logic 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    132d6be View commit details
    Browse the repository at this point in the history

  6. Fix linting 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    a285137 View commit details
    Browse the repository at this point in the history

  7. Add changelog entries 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    22e1ab7 View commit details
    Browse the repository at this point in the history

  8. Add changelog entries 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    281a159 View commit details
    Browse the repository at this point in the history

  9. Add changelog entries 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    488f868 View commit details
    Browse the repository at this point in the history

  10. Add changelog entries 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    c838e42 View commit details
    Browse the repository at this point in the history

  11. Add changelog entry 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    dfa0117 View commit details
    Browse the repository at this point in the history

  12. Update CHANGELOG.md 

    Co-authored-by: Oleg Zaytsev <[email protected]>
    @aknuds1 @colega
    aknuds1 and colega authored Nov 27, 2024
    Configuration menu
    Copy the full SHA
    4f0a5e2 View commit details
    Browse the repository at this point in the history

  13. Update CHANGELOG.md 

    Co-authored-by: Oleg Zaytsev <[email protected]>
    @aknuds1 @colega
    aknuds1 and colega authored Nov 27, 2024
    Configuration menu
    Copy the full SHA
    5f23145 View commit details
    Browse the repository at this point in the history

  14. Update changelog 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    d23ba50 View commit details
    Browse the repository at this point in the history

  15. Add changelog entry 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    cde8aac View commit details
    Browse the repository at this point in the history

  16. Distributor: Add UTF-8 validation test 

    Signed-off-by: Arve Knudsen <[email protected]>
    @aknuds1
    aknuds1 committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    b7f5f05 View commit details
    Browse the repository at this point in the history