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

Runtime override of tenant-specific active series custom trackers #1188

Merged
merged 98 commits into from
Apr 5, 2022
Merged

Runtime override of tenant-specific active series custom trackers #1188

merged 98 commits into from
Apr 5, 2022

Commits on Feb 11, 2022

  1. Initial implementation

    @gubjanos
    gubjanos committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    9139200 View commit details
    Browse the repository at this point in the history

  2. fixing test

    @gubjanos
    gubjanos committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    ceaecba View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2022

  1. More straightworward logic

    @gubjanos
    gubjanos committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    31f697b View commit details
    Browse the repository at this point in the history

  2. Some tests

    @gubjanos
    gubjanos committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    6318a97 View commit details
    Browse the repository at this point in the history

  3. Clearing out tests

    @gubjanos
    gubjanos committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    2be8c3b View commit details
    Browse the repository at this point in the history

  4. Removing unused code

    @gubjanos
    gubjanos committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    6386997 View commit details
    Browse the repository at this point in the history

  5. Smaller fixes

    @gubjanos
    gubjanos committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    f4dd1d5 View commit details
    Browse the repository at this point in the history

  6. Fixes based on oleg's review

    @gubjanos
    gubjanos committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    34d4953 View commit details
    Browse the repository at this point in the history

  7. Simplifying diff logic by comparing current and present logic every t… 

    …ime at config reload
    @gubjanos
    gubjanos committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    46d96bf View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2022

  1. Making serialization fail if matchers are not parseable

    @gubjanos
    gubjanos committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    c729776 View commit details
    Browse the repository at this point in the history

  2. Proper checking of series matcher equality

    @gubjanos
    gubjanos committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    c5d38a4 View commit details
    Browse the repository at this point in the history

  3. Changing slice allocation based on oleg's suggestion

    @gubjanos
    gubjanos committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    2821436 View commit details
    Browse the repository at this point in the history

  4. 'interning' default matchers to avoid memory leak

    @gubjanos
    gubjanos committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    4a39127 View commit details
    Browse the repository at this point in the history

  5. Support flag based config if no runtime config provided

    @gubjanos
    gubjanos committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    a65aaf1 View commit details
    Browse the repository at this point in the history

  6. Adding test cases for backward compatibility and overwrite check

    @gubjanos
    gubjanos committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    4fd52f1 View commit details
    Browse the repository at this point in the history

  7. Cleaning up

    @gubjanos
    gubjanos committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    d987078 View commit details
    Browse the repository at this point in the history

  8. Early-exit when pointers reference the same object

    @gubjanos
    gubjanos committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    cd7bc5e View commit details
    Browse the repository at this point in the history

  9. Changing equality check to string concatenation based as it is much f… 

    …aster
    @gubjanos
    gubjanos committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    96aca48 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2022

  1. Matcher configuration fix + adjusting test

    @gubjanos
    gubjanos committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    b552d66 View commit details
    Browse the repository at this point in the history

  2. Adding active_series_custom_tracker tests

    @gubjanos
    gubjanos committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    bb4e8b1 View commit details
    Browse the repository at this point in the history

  3. Adding active_series_test

    @gubjanos
    gubjanos committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    fa925be View commit details
    Browse the repository at this point in the history

  4. Fixes based on oleg's suggestions

    @gubjanos
    gubjanos committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    c651fca View commit details
    Browse the repository at this point in the history

  5. fixup

    @gubjanos
    gubjanos committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    28b4ff0 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2022

  1. fixup

    @gubjanos
    gubjanos committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    e2250a9 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2022

  1. Incorporating oleg's suggestions

    @gubjanos
    gubjanos committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    378c86e View commit details
    Browse the repository at this point in the history

  2. Adding more tests

    @gubjanos
    gubjanos committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    858863a View commit details
    Browse the repository at this point in the history

  3. cleanup

    @gubjanos
    gubjanos committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    66e6ea1 View commit details
    Browse the repository at this point in the history

  4. Adding testcase for empty default overwrite and fixing this corner case

    @gubjanos
    gubjanos committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    1fcd42c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into runtime-matchers

    @gubjanos
    gubjanos authored Feb 21, 2022
    Configuration menu
    Copy the full SHA
    36cb4a4 View commit details
    Browse the repository at this point in the history

  6. Test fixes

    @gubjanos
    gubjanos committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    3dd657e View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2022

  1. Test fixes, lint fixes

    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    5209623 View commit details
    Browse the repository at this point in the history

  2. Adding more testcases

    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    5da5bce View commit details
    Browse the repository at this point in the history

  3. Changing assert.NoError to require.NoError when immediate halting is … 

    …required
    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    203d66e View commit details
    Browse the repository at this point in the history

  4. lint fix and merge resolve fix

    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    60f67ce View commit details
    Browse the repository at this point in the history

  5. Reintroducing ActiveSeriesCustomTrackerConfig because ingester config… 

    … should not

contain structs
    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    40ea210 View commit details
    Browse the repository at this point in the history

  6. Adding more context to asm.key comment

    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    c8ee2c9 View commit details
    Browse the repository at this point in the history

  7. Changing back flag based description as it allows multiple flags

    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    8cde596 View commit details
    Browse the repository at this point in the history

  8. changing back to exact wording

    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    47c7a0c View commit details
    Browse the repository at this point in the history

  9. fixup

    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    9e1ef8e View commit details
    Browse the repository at this point in the history

  10. Using config type instead of map[string]string in tests, cleanup

    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    bbf54a5 View commit details
    Browse the repository at this point in the history

  11. Adding test case for metric cleanup

    @gubjanos
    gubjanos committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    42870e5 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2022

  1. Changing ActiveSeriesCustomTrackerConfig to contain []labelMatchers 

    instead of strings
    @gubjanos
    gubjanos committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    79304c5 View commit details
    Browse the repository at this point in the history

  2. Adding assumption to deserialization test, and adding comment to Stri… 

    …ng()
    @gubjanos
    gubjanos committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    c076c04 View commit details
    Browse the repository at this point in the history

  3. Trying to speed up comparison

    @gubjanos
    gubjanos committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    20cb06f View commit details
    Browse the repository at this point in the history

  4. Make custom trackers be unmarshaled as a map 

    Instead of being a struct that holds a map, which an unnecessary
wrapping.

We need to tweak the docs parser for that, checking first whether a
struct field is a custom field, in that case it's not a block.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @colega
    colega committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    7d0792c View commit details
    Browse the repository at this point in the history

  5. Refactor config parsing, make string key static 

    Instead of calculating string key, we calculate it once when we change
the config map (either parsing a flag or unmarshaling yaml)

Also, unexport the config constructor: we don't expect anyone to call it
from outside.

Also renamed `safe...` to `must...` as that's the golang convention.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @colega
    colega committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    2bc4da1 View commit details
    Browse the repository at this point in the history

  6. No need to store asm.key since config.string is static now 

    Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @colega
    colega committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    23e84eb View commit details
    Browse the repository at this point in the history

  7. Make config.String() be a valid flag value. 

    Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @colega
    colega committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    ed1bdfa View commit details
    Browse the repository at this point in the history

  8. Move config to same file as overrides, and rename file. 

    Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @colega
    colega committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    b490ca8 View commit details
    Browse the repository at this point in the history

  9. Updating help template

    @gubjanos
    gubjanos committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    712cbbe View commit details
    Browse the repository at this point in the history

  10. Creating ActiveSeriesMatchers only at replace time

    @gubjanos
    gubjanos committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    ef3b51b View commit details
    Browse the repository at this point in the history

  11. Revert "Creating ActiveSeriesMatchers only at replace time" 

    This reverts commit ef3b51b.
    @gubjanos
    gubjanos committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    d324631 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2022

  1. Creating ActiveSeriesMatchers only at replace time 

    This reverts commit d324631.
    @gubjanos
    gubjanos committed Feb 24, 2022
    Configuration menu
    Copy the full SHA
    07ae65c View commit details
    Browse the repository at this point in the history

  2. Update tools/doc-generator/parser.go 

    Co-authored-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @gubjanos @colega
    gubjanos and colega authored Feb 24, 2022
    Configuration menu
    Copy the full SHA
    78e325a View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2022

  1. Changes based on oleg's comments

    @gubjanos
    gubjanos committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    80b593b View commit details
    Browse the repository at this point in the history

  2. Replacing matchings for active series and including test case for this

    @gubjanos
    gubjanos committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    30ae4f6 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2022

  1. Rework and implementing oleg and pstibrany's suggestions

    @gubjanos
    gubjanos committed Feb 28, 2022
    Configuration menu
    Copy the full SHA
    dc4b3e3 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2022

  1. Moving active series to separate package

    @gubjanos
    gubjanos committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    0132477 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2022

  1. Moving tenant specific configuration to limits, updating tests

    @gubjanos
    gubjanos committed Mar 2, 2022
    Configuration menu
    Copy the full SHA
    6c332a9 View commit details
    Browse the repository at this point in the history

  2. Lint fixes, file renaming

    @gubjanos
    gubjanos committed Mar 2, 2022
    Configuration menu
    Copy the full SHA
    9820074 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into runtime-matchers

    @gubjanos
    gubjanos committed Mar 2, 2022
    Configuration menu
    Copy the full SHA
    843ee36 View commit details
    Browse the repository at this point in the history

  4. Use plain struct for config, not pointer 

    Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @colega
    colega committed Mar 2, 2022
    Configuration menu
    Copy the full SHA
    3035b4f View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2022

  1. CustomTrackersConfig annotation fix

    @gubjanos
    gubjanos committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    44f9fdc View commit details
    Browse the repository at this point in the history

  2. Adding documentation on limits

    @gubjanos
    gubjanos committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    bfe3f6d View commit details
    Browse the repository at this point in the history

  3. Moving active serreis flag to limits, removing runtime default, fixin… 

    …g up tests
    @gubjanos
    gubjanos committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    e289c56 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2022

  1. Adding custom trackers loading metrics and tests for it

    @gubjanos
    gubjanos committed Mar 4, 2022
    Configuration menu
    Copy the full SHA
    62fd2ef View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2022

  1. Adjustments based on Oleg's comments, and introducing single source of 

    time in ingester.
    @gubjanos
    gubjanos committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    23a8996 View commit details
    Browse the repository at this point in the history

  2. Adding back ActiveSeriesCustomTrackersConfig to ingester for backward… 

    … compatibility, with deprecation note
    @gubjanos
    gubjanos committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    d247dec View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into runtime-matchers

    @gubjanos
    gubjanos committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    3f942cd View commit details
    Browse the repository at this point in the history

  4. lintfix

    @gubjanos
    gubjanos committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    e551d87 View commit details
    Browse the repository at this point in the history

  5. Test fix

    @gubjanos
    gubjanos committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    21e7671 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Rework based on Oleg's suggestions

    @gubjanos
    gubjanos committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    34ac0a5 View commit details
    Browse the repository at this point in the history

  2. Update pkg/ingester/activeseries/active_series_test.go 

    Co-authored-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @gubjanos @colega
    gubjanos and colega authored Mar 17, 2022
    Configuration menu
    Copy the full SHA
    f7136fb View commit details
    Browse the repository at this point in the history

  3. Update pkg/ingester/activeseries/active_series_test.go 

    Co-authored-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @gubjanos @colega
    gubjanos and colega authored Mar 17, 2022
    Configuration menu
    Copy the full SHA
    7ca8b1e View commit details
    Browse the repository at this point in the history

  4. Removing accidentally added file

    @gubjanos
    gubjanos committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    e14d4db View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. Update pkg/ingester/activeseries/active_series.go 

    Co-authored-by: Mauro Stettler <mauro.stettler@gmail.com>
    @gubjanos @replay
    gubjanos and replay authored Mar 18, 2022
    Configuration menu
    Copy the full SHA
    69054d3 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2022

  1. Reworking active series trackers to get time from external calls

    @gubjanos
    gubjanos committed Mar 23, 2022
    Configuration menu
    Copy the full SHA
    47326c0 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2022

  1. Addressing review on comments and minor cleanup

    @gubjanos
    gubjanos committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    fd15e6a View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2022

  1. Changing active series deprecation override location and adding unit … 

    …tests for it
    @gubjanos
    gubjanos committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    9e0a0e2 View commit details
    Browse the repository at this point in the history

  2. Adding TODO to remove module unit tests with Mimir 2.2 and adding hig… 

    …her level test to test runtime override case
    @gubjanos
    gubjanos committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    5d12046 View commit details
    Browse the repository at this point in the history

  3. Removing accidentally commited file (again...)

    @gubjanos
    gubjanos committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    f24c6d2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into runtime-matchers

    @gubjanos
    gubjanos committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    9d6aeb7 View commit details
    Browse the repository at this point in the history

  5. Removing unused method clear.

    @gubjanos
    gubjanos committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    df0bb8d View commit details
    Browse the repository at this point in the history

  6. Updating config-descriptor

    @gubjanos
    gubjanos committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    c0149a7 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. WIP Fixing data race

    @gubjanos
    gubjanos committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    583d9da View commit details
    Browse the repository at this point in the history

  2. Fixing mimir_test.go

    @gubjanos
    gubjanos committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    273179a View commit details
    Browse the repository at this point in the history

  3. Referencing issue in test to explain why sleep is needed

    @gubjanos
    gubjanos committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    c5311bb View commit details
    Browse the repository at this point in the history

  4. Lint fix

    @gubjanos
    gubjanos committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    a8a230f View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Adding entry to CHANGELOG.md

    @gubjanos
    gubjanos committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    737a08b View commit details
    Browse the repository at this point in the history

  2. Fixup for the changelog

    @gubjanos
    gubjanos committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    444d0a9 View commit details
    Browse the repository at this point in the history

  3. More precise wording for the changelog

    @gubjanos
    gubjanos committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    5fb103f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into runtime-matchers

    @gubjanos
    gubjanos committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    5aed13d View commit details
    Browse the repository at this point in the history

  5. Comment fix based on Oleg's suggestion 

    Co-authored-by: Oleg Zaytsev <mail@olegzaytsev.com>
    @gubjanos @colega
    gubjanos and colega authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    b04a320 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Merge branch 'main' into runtime-matchers

    @gubjanos
    gubjanos authored Apr 1, 2022
    Configuration menu
    Copy the full SHA
    62e3b90 View commit details
    Browse the repository at this point in the history

  2. Lintfix after online editor conflict resolve

    @gubjanos
    gubjanos committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    28e3b2a View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Merge branch 'main' into runtime-matchers

    @gubjanos
    gubjanos committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    9f9487c View commit details
    Browse the repository at this point in the history

  2. Modifications based on pstibrany's comments

    @gubjanos
    gubjanos committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    a043d12 View commit details
    Browse the repository at this point in the history

  3. Fixing reference-help

    @gubjanos
    gubjanos committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    48bb8ea View commit details
    Browse the repository at this point in the history