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

Promtail: Fix docker-compose.yaml #2575

Merged
merged 1 commit into from
Sep 1, 2020

Conversation

unguiculus
Copy link
Contributor

This adjusts docker-compose.yaml to changes made in #2196.

This adjusts docker-compose.yaml to changes made in grafana#2196.
@CLAassistant
Copy link

CLAassistant commented Aug 31, 2020

CLA assistant check
All committers have signed the CLA.

@codecov-commenter
Copy link

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2575      +/-   ##
==========================================
+ Coverage   62.85%   62.91%   +0.05%     
==========================================
  Files         169      169              
  Lines       14913    14913              
==========================================
+ Hits         9374     9382       +8     
+ Misses       4790     4786       -4     
+ Partials      749      745       -4     
Impacted Files Coverage Δ
pkg/promtail/targets/file/filetarget.go 69.14% <0.00%> (+2.28%) ⬆️
pkg/promtail/targets/file/tailer.go 75.00% <0.00%> (+4.16%) ⬆️

Copy link
Collaborator

@slim-bean slim-bean 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 @unguiculus !

@slim-bean slim-bean merged commit 43f5841 into grafana:master Sep 1, 2020
cyriltovena pushed a commit to cyriltovena/loki that referenced this pull request Jun 11, 2021
* add the cassandra.table-with flag

Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com>

* update CHANGELOG and docs

Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com>

* add PR number to CHANGELOG

Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com>

* remove blacklisted package import

Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com>

* fix import with goimports

Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com>

* rename table_with to table_options and improve the flag usage

Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com>

* add a description about configuring table options to documentation: Running Cortex with Cassandra

Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com>

* clean white noise

Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com>
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