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: Rename Fluent Bit plugin output name. #2974

Merged
merged 1 commit into from
Dec 7, 2020

Conversation

hedss
Copy link
Contributor

@hedss hedss commented Nov 21, 2020

This prevents a clash with the Loki plugin now included with
the Fluent Bit agent by default.

The output plugin is now named grafana-loki.

Signed-off-by: Heds Simons heds@whaleway.net

What this PR does / why we need it:
Fluent Bit now ships with their version of a Loki output plugin. Unfortunately, they named it loki, so when trying to use the Grafana Loki Fluent Bit plugin a clash occurs and Fluent Bit exits.

This PR changes the name of the Loki output stage to grafana-loki to circumvent this and allow the plugin to continue working.

Which issue(s) this PR fixes:
N/A

Special notes for your reviewer:
Tested by building both the Fluent Bit plugin (via make fluent-bit-plugin) and running it against the latest Fluent Bit client.
Also built and tested the Fluent Bit docker image.
Both were tested against a Grafana hosted remote Loki endpoint.

Checklist

  • Documentation added
  • Tests updated

This prevents a clash with the Loki plugin now included with
the Fluent Bit agent by default.

The output plugin is now named `grafana-loki`.

Signed-off-by: Heds Simons <heds@whaleway.net>
@codecov-io
Copy link

Codecov Report

Merging #2974 (9608346) into master (8ea5fd1) will decrease coverage by 0.08%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2974      +/-   ##
==========================================
- Coverage   61.84%   61.76%   -0.09%     
==========================================
  Files         182      182              
  Lines       14870    14870              
==========================================
- Hits         9197     9184      -13     
- Misses       4824     4838      +14     
+ Partials      849      848       -1     
Impacted Files Coverage Δ
cmd/fluent-bit/out_grafana_loki.go 4.05% <0.00%> (ø)
pkg/promtail/positions/positions.go 46.80% <0.00%> (-11.71%) ⬇️
pkg/logql/evaluator.go 91.24% <0.00%> (-0.41%) ⬇️

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.

LGTM Thanks @hedss

@cyriltovena
Copy link
Contributor

/cc @kavirajk This could helps you run two Loki output in a single fluent-bit container.

@cyriltovena cyriltovena merged commit b195e94 into master Dec 7, 2020
@cyriltovena cyriltovena deleted the fluent-bit-prevent-plugin-clash branch December 7, 2020 09:30
slim-bean pushed a commit that referenced this pull request Dec 23, 2020
This prevents a clash with the Loki plugin now included with
the Fluent Bit agent by default.

The output plugin is now named `grafana-loki`.

Signed-off-by: Heds Simons <heds@whaleway.net>
(cherry picked from commit b195e94)
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