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

fluent-bit: Add more loki client configuration options #2367

Merged
merged 2 commits into from
Jul 17, 2020

Conversation

dojci
Copy link
Contributor

@dojci dojci commented Jul 16, 2020

What this PR does / why we need it:

  1. Adds loki client configuration options:
  • Timeout
  • MinBackoff
  • MaxBackoff
  • MaxRetries
  1. Changes configuration unit:
  • BatchWait

Special notes for your reviewer:
BatchWait configuration unit should be same as other Duration based options: BatchWait 1 --> BatchWait 1s. When BatchWait value is set by user this change is not backwards compatible.

Checklist

  • Documentation added
  • Tests updated

@pull-request-size pull-request-size bot added size/L and removed size/M labels Jul 16, 2020
@codecov-commenter
Copy link

Codecov Report

Merging #2367 into master will increase coverage by 0.07%.
The diff coverage is 83.87%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2367      +/-   ##
==========================================
+ Coverage   61.50%   61.57%   +0.07%     
==========================================
  Files         160      160              
  Lines       13534    13562      +28     
==========================================
+ Hits         8324     8351      +27     
- Misses       4585     4587       +2     
+ Partials      625      624       -1     
Impacted Files Coverage Δ
cmd/fluent-bit/out_loki.go 5.12% <0.00%> (-0.28%) ⬇️
cmd/fluent-bit/config.go 82.48% <100.00%> (+3.72%) ⬆️
pkg/promtail/targets/file/filetarget.go 70.48% <0.00%> (+1.80%) ⬆️

Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

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

Good job ! Thank you for this.

@cyriltovena cyriltovena merged commit eb39e82 into grafana:master Jul 17, 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.

3 participants