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

Documentation: Outdated fluentd image name, UID details, link update #2112

Merged
merged 2 commits into from
May 25, 2020

Conversation

n-saw
Copy link

@n-saw n-saw commented May 22, 2020

What this PR does / why we need it:
Updates documentation:

  • Name of the fluentd docker image was outdated
  • Adds details on UID for docker image, default as of v1.5.0 and how to change it
  • Update link on documentation to also link to Installing with docker

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated

@CLAassistant
Copy link

CLAassistant commented May 22, 2020

CLA assistant check
All committers have signed the CLA.

@codecov-commenter
Copy link

Codecov Report

Merging #2112 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2112   +/-   ##
=======================================
  Coverage   61.25%   61.25%           
=======================================
  Files         146      146           
  Lines       11193    11193           
=======================================
  Hits         6856     6856           
  Misses       3791     3791           
  Partials      546      546           

@@ -1,13 +1,13 @@
# Fluentd

Loki has a [Fluentd](https://www.fluentd.org/) output plugin called
`fluent-plugin-grafana-loki` that enables shipping logs to a private Loki
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

The reason behind is the fluent-plugin-loki gem has been taken by someone else.

@@ -119,18 +119,20 @@ This plugin automatically adds a `fluentd_thread` label with the name of the buf

## Docker Image

There is a Docker image `grafana/fluent-plugin-grafana-loki:master` which contains [default configuration files](https://github.com/grafana/loki/tree/master/fluentd/fluent-plugin-grafana-loki/docker/conf). By default, fluentd containers use the configurations but you can also specify your `fluentd.conf` with `FLUENTD_CONF` environment variable.
There is a Docker image `grafana/fluent-plugin-loki:master` which contains [default configuration files](https://github.com/grafana/loki/tree/master/fluentd/fluent-plugin-loki/docker/conf). By default, fluentd containers use the configurations but you can also specify your `fluentd.conf` with `FLUENTD_CONF` environment variable.
Copy link
Contributor

Choose a reason for hiding this comment

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

However this is correct :) now ! the docker image is grafana/fluent-plugin-loki:master

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 we just need to fix the gem.

And seriously thank you for helping !!!!!!

@cyriltovena cyriltovena merged commit a0546a3 into grafana:master May 25, 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.

None yet

4 participants