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

Adds default -config.file for the promtail docker images. #2196

Merged
merged 1 commit into from
Jun 22, 2020

Conversation

cyriltovena
Copy link
Contributor

Closes #2194.

This is already the case for Loki. I think it's better to have this since most people would expect it as default at least for docker. (which was the case for #2194 )

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

Closes grafana#2194.

This is already the case for Loki. I think it's better to have this since most people would expect it as default at least for docker.

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

Codecov Report

Merging #2196 into master will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2196      +/-   ##
==========================================
+ Coverage   61.97%   61.99%   +0.01%     
==========================================
  Files         154      154              
  Lines       12432    12432              
==========================================
+ Hits         7705     7707       +2     
+ Misses       4119     4118       -1     
+ Partials      608      607       -1     
Impacted Files Coverage Δ
pkg/promtail/targets/tailer.go 78.40% <0.00%> (+2.27%) ⬆️

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.

nice - although I remember being confused how this was working before I knew we injected these :)

@cyriltovena cyriltovena merged commit 732fe6d into grafana:master Jun 22, 2020
unguiculus added a commit to unguiculus/loki that referenced this pull request Aug 31, 2020
This adjusts docker-compose.yaml to changes made in grafana#2196.
slim-bean pushed a commit that referenced this pull request Sep 1, 2020
This adjusts docker-compose.yaml to changes made in #2196.
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.

Promtail - Error - at least one client config should be provided
3 participants