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

Loki: Common Config #4347

Merged
merged 11 commits into from
Oct 1, 2021
Merged

Loki: Common Config #4347

merged 11 commits into from
Oct 1, 2021

Commits on Sep 17, 2021

  1. refactor the pkg/util/cfg package to simplify and make it accessable … 

    …outside of this package.

create a pkg/cfg which handles building the Loki config, this is created separately from pkg/util (which is Apache 2 licensed) to maintain proper separations of AGPL and Apache 2 code
Update the main.go for several of the apps with the refactoring
    @slim-bean
    slim-bean committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    cb9c670 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2021

  1. refactor how dynamic/common config is loaded 

    Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
    @trevorwhitney
    trevorwhitney committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    b16004b View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Add common config logic for path prefix 

    Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
    @trevorwhitney
    trevorwhitney committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    4aaf99c View commit details
    Browse the repository at this point in the history

  2. Missed a file, update common config with prefix property 

    Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
    @trevorwhitney
    trevorwhitney committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    81a8b1b View commit details
    Browse the repository at this point in the history

  3. fix test, remove loki from args 

    Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
    @trevorwhitney
    trevorwhitney committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    c0afa15 View commit details
    Browse the repository at this point in the history

  4. Clean up test names 

    Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
    @trevorwhitney
    trevorwhitney committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    c4c9b2c View commit details
    Browse the repository at this point in the history

  5. fix typo in filename, make linter happy 

    Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
    @trevorwhitney
    trevorwhitney committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    780efaf View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Update pkg/loki/config_wrapper.go 

    Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
    @trevorwhitney @owen-d
    trevorwhitney and owen-d authored Sep 30, 2021
    Configuration menu
    Copy the full SHA
    317efba View commit details
    Browse the repository at this point in the history

  2. Update pkg/loki/config_wrapper.go 

    Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
    @trevorwhitney @owen-d
    trevorwhitney and owen-d authored Sep 30, 2021
    Configuration menu
    Copy the full SHA
    3404c95 View commit details
    Browse the repository at this point in the history

  3. Update pkg/loki/config_wrapper_test.go 

    Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
    @trevorwhitney @owen-d
    trevorwhitney and owen-d authored Sep 30, 2021
    Configuration menu
    Copy the full SHA
    d993c18 View commit details
    Browse the repository at this point in the history

  4. remove temp files in test 

    Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
    @trevorwhitney
    trevorwhitney committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    1140046 View commit details
    Browse the repository at this point in the history