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.

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

Fixes the fluentbit batchwait backward compatiblity. #2375

Merged
merged 1 commit into from
Jul 20, 2020

Conversation

cyriltovena
Copy link
Contributor

We move from second 1 to duration 1s, but we can keep that compatible.

Signed-off-by: Cyril Tovena cyril.tovena@gmail.com

Fixes #2372

We move from second `1` to duration `1s`, but we can keep that compatible.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
@codecov-commenter
Copy link

Codecov Report

Merging #2375 into master will increase coverage by 0.15%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2375      +/-   ##
==========================================
+ Coverage   61.65%   61.80%   +0.15%     
==========================================
  Files         160      160              
  Lines       13565    13569       +4     
==========================================
+ Hits         8363     8386      +23     
+ Misses       4579     4559      -20     
- Partials      623      624       +1     
Impacted Files Coverage Δ
cmd/fluent-bit/config.go 82.97% <100.00%> (+0.49%) ⬆️
pkg/logql/evaluator.go 92.88% <0.00%> (+0.40%) ⬆️
pkg/querier/queryrange/downstreamer.go 97.93% <0.00%> (+2.06%) ⬆️
pkg/promtail/positions/positions.go 60.71% <0.00%> (+13.39%) ⬆️

Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@owen-d owen-d merged commit 81c7bd3 into grafana:master Jul 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Loki FluentBit plugin: failed to parse BatchWait: 1
3 participants