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

Update mimir-prometheus to 320f0c9c4a88 #6085

Merged
merged 34 commits into from
Sep 28, 2023
Merged

Update mimir-prometheus to 320f0c9c4a88 #6085

merged 34 commits into from
Sep 28, 2023

Commits on Sep 25, 2023

  1. Update mimir-prometheus to 320f0c9c4a88 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    73ba19d View commit details
    Browse the repository at this point in the history

  2. Fix annotations 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    2b36159 View commit details
    Browse the repository at this point in the history

  3. Make distributorQuerier discover tenant from context instead 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    7933332 View commit details
    Browse the repository at this point in the history

  4. Remove context argument from querier.New 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    7272b3d View commit details
    Browse the repository at this point in the history

  5. Remove context from tenantfederation.NewQueryable 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    1ca8f1b View commit details
    Browse the repository at this point in the history

  6. Remove context from querier.NewBlocksStoreQueryableFromConfig 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    0d1cbfa View commit details
    Browse the repository at this point in the history

  7. Remove context from tenantfederation.NewQueryable 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    5590e65 View commit details
    Browse the repository at this point in the history

  8. Fix build 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    08fa63f View commit details
    Browse the repository at this point in the history

  9. Fix tests 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    90a651c View commit details
    Browse the repository at this point in the history

  10. querier.New: Remove error 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    6b6853a View commit details
    Browse the repository at this point in the history

  11. Remove error from tenantfederation.NewQueryable 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    72f5d96 View commit details
    Browse the repository at this point in the history

  12. Externalize context creation in mergeQuerier 

    Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
    @krajorama @aknuds1
    krajorama authored and aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    210199c View commit details
    Browse the repository at this point in the history

  13. mergeQuerier.Select: Don't use ForEachJob context 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    ea2efbe View commit details
    Browse the repository at this point in the history

  14. Cleanup 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    d6c66d6 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge remote-tracking branch 'origin/main' into arve/revendor-prometheus

    @aknuds1
    aknuds1 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    bb99c4f View commit details
    Browse the repository at this point in the history

  2. Ingester: Don't interrupt TSDB creation due to context cancellation 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    8e8afb4 View commit details
    Browse the repository at this point in the history

  3. Address review feedback 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    d234f24 View commit details
    Browse the repository at this point in the history

  4. Fix tenantfederation bug 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    54737a4 View commit details
    Browse the repository at this point in the history

  5. Remove unnecessary LookupSymbol context 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    b8a800d View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. tenantfederation: Make NewMergeQueryable customizable again. 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    9c41715 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into arve/revendor-prometheus 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    0256220 View commit details
    Browse the repository at this point in the history

  3. Undo unnecessary change 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    233ddc0 View commit details
    Browse the repository at this point in the history

  4. Update changelog 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    090c56b View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Add changelog entries, remove stale TODO 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    9e1fd07 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into arve/revendor-prometheus

    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    c61b9ff View commit details
    Browse the repository at this point in the history

  3. Preallocate warnings 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    933ce78 View commit details
    Browse the repository at this point in the history

  4. Simplify tests 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    023c0bf View commit details
    Browse the repository at this point in the history

  5. Rename MergeQuerierCallbacks to MergeQueryableCallbacks for consistency 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    521ac98 View commit details
    Browse the repository at this point in the history

  6. Fix doc strings 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    5d73e4d View commit details
    Browse the repository at this point in the history

  7. Fix comment 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    c355b16 View commit details
    Browse the repository at this point in the history

  8. Update CHANGELOG.md 

    Co-authored-by: Marco Pracucci <marco@pracucci.com>
    @aknuds1 @pracucci
    aknuds1 and pracucci committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    5b31e47 View commit details
    Browse the repository at this point in the history

  9. Rename server argument to stream 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    9075821 View commit details
    Browse the repository at this point in the history

  10. Ingester: Don't pass service context to compaction methods 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    1fb6de7 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/main' into arve/revendor-prometheus 

    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    @aknuds1
    aknuds1 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    df68d7a View commit details
    Browse the repository at this point in the history