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

[Promtail] drop lines with malformed json #6099

Merged
merged 10 commits into from
May 24, 2022
Merged

[Promtail] drop lines with malformed json #6099

merged 10 commits into from
May 24, 2022

Commits on May 5, 2022

  1. Refactor json pipeline stage to have a Run function 

    Signed-off-by: Callum Styan <[email protected]>
    @cstyan
    cstyan committed May 5, 2022
    Configuration menu
    Copy the full SHA
    2b7f02b View commit details
    Browse the repository at this point in the history

  2. Allow for dropping log lines in json pipeline stage if they are not 

    valid json strings

Signed-off-by: Callum Styan <[email protected]>
    @cstyan
    cstyan committed May 5, 2022
    Configuration menu
    Copy the full SHA
    91a4739 View commit details
    Browse the repository at this point in the history

  3. fix linting 

    Signed-off-by: Callum Styan <[email protected]>
    @cstyan
    cstyan committed May 5, 2022
    Configuration menu
    Copy the full SHA
    5e439c6 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2022

  1. Clean up new malformed json test. 

    Signed-off-by: Callum Styan <[email protected]>
    @cstyan
    cstyan committed May 17, 2022
    Configuration menu
    Copy the full SHA
    0fb2149 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2022

  1. Address some review feedback. 

    Signed-off-by: Callum Styan <[email protected]>
    @cstyan
    cstyan committed May 19, 2022
    Configuration menu
    Copy the full SHA
    63082b8 View commit details
    Browse the repository at this point in the history

  2. Refactor json pipeline stage test to use testify assert instead of 

    t.Errorf

Signed-off-by: Callum Styan <[email protected]>
    @cstyan
    cstyan committed May 19, 2022
    Configuration menu
    Copy the full SHA
    7bf7309 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. Update changelog and docs with new drop malformed option 

    Signed-off-by: Callum Styan <[email protected]>
    @cstyan
    cstyan committed May 20, 2022
    Configuration menu
    Copy the full SHA
    80dd811 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2022

  1. Update CHANGELOG.md 

    Co-authored-by: Karen Miller <[email protected]>
    @cstyan @KMiller-Grafana
    cstyan and KMiller-Grafana authored May 24, 2022
    Configuration menu
    Copy the full SHA
    12f4089 View commit details
    Browse the repository at this point in the history

  2. Update docs based on Karen's comments. 

    Signed-off-by: Callum Styan <[email protected]>
    @cstyan
    cstyan committed May 24, 2022
    Configuration menu
    Copy the full SHA
    22eaf46 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into promtail-malformed-json

    @cstyan
    cstyan committed May 24, 2022
    Configuration menu
    Copy the full SHA
    c317829 View commit details
    Browse the repository at this point in the history