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: tenant ID configuration #1273

Merged
merged 2 commits into from
Nov 26, 2019

Conversation

JensErat
Copy link
Contributor

What this PR does / why we need it:

Both promtail and the fluentd plugin already have support for sending a
tenant ID, and all necessary for doing so in fluent-bit is actually
passing through the configuration item. Configuration is aligned with
the fluentd plugin for consistency.

We're lucky, since no configuration will result in an empty string that
will be treated as no tenant ID by the Loki shipping client.

This has also been tested against the most current Loki server release.

I also sneaked in a minor documentation spelling fix on the go.

Which issue(s) this PR fixes:

Not being able to send tenant ID without reverse proxy.

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated

@JensErat
Copy link
Contributor Author

This misses a line for dumping the configuration, will add this soon.

Both promtail and the fluentd plugin already have support for sending a
tenant ID, and all necessary for doing so in fluent-bit is actually
passing through the configuration item. Configuration is aligned with
the fluentd plugin for consistency.

We're lucky, since no configuration will result in an empty string that
will be treated as no tenant ID by the Loki shipping client.

Signed-off-by: Jens Erat <email@jenserat.de>
Signed-off-by: Jens Erat <email@jenserat.de>
@JensErat
Copy link
Contributor Author

This is ready to go from my side.

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

@cyriltovena cyriltovena merged commit 374ac1b into grafana:master Nov 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants