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

--dry-run Promtail. #1652

Merged
merged 10 commits into from
Feb 13, 2020
Merged

--dry-run Promtail. #1652

merged 10 commits into from
Feb 13, 2020

Conversation

cyriltovena
Copy link
Contributor

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

Allows --dry-run in promtail to prints entries instead of sending them to Loki.

Waiting on #1649 to be merged first, so I can stop position from being update, will use a noopPositionFile and also update the doc.

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

Codecov Report

Merging #1652 into master will increase coverage by 0.07%.
The diff coverage is 76.92%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1652      +/-   ##
==========================================
+ Coverage    61.8%   61.88%   +0.07%     
==========================================
  Files         109      110       +1     
  Lines        8308     8341      +33     
==========================================
+ Hits         5135     5162      +27     
- Misses       2780     2785       +5     
- Partials      393      394       +1
Impacted Files Coverage Δ
pkg/promtail/promtail.go 70.58% <50%> (-0.85%) ⬇️
pkg/promtail/client/logger.go 88.88% <88.88%> (ø)
pkg/promtail/targets/filetarget.go 68.71% <0%> (-1.85%) ⬇️
pkg/promtail/targets/tailer.go 78.16% <0%> (+2.29%) ⬆️

pkg/promtail/promtail_test.go Show resolved Hide resolved
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

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

LGTM! I'm not sure it's necessary to change positions to an interface, but I don't see anything wrong with doing that, either.

@cyriltovena
Copy link
Contributor Author

LGTM! I'm not sure it's necessary to change positions to an interface, but I don't see anything wrong with doing that, either.

I actually was about to use that interface to send a different type depending on the configuration, but then I realize I will be able to without. And I also thought it can't hurt, still good to have abstraction.

@cyriltovena cyriltovena merged commit 4210fce into grafana:master Feb 13, 2020
billimek added a commit to billimek/loki that referenced this pull request Feb 13, 2020
* 'extraPorts' of github.com:billimek/loki: (25 commits)
  Ensure status codes are set correctly in the frontend. (grafana#1684)
  --dry-run Promtail. (grafana#1652)
  Fix logcli --quiet parameter parsing issue (grafana#1682)
  This improves the log ouput for statistics in the logcli. (grafana#1644)
  Loki stack helm chart can deploy datasources without Grafana (grafana#1688)
  Automatically prune metrics from the /metrics output of the promtail metrics pipeline stage after an idle period.
  Allow a metric defined as a counter to match all lines, useful for creating line count metrics which include all your labels. Found a bug in the the test runner where it didn't fail if the actual error was nil but the test expected an error Added some tests to the counters to test valid configs
  maintainer links & usernames (grafana#1675)
  Binary operators in LogQL (grafana#1662)
  Pipe data to Promtail (grafana#1649)
  Add Owen to the maintainer team. (grafana#1673)
  Update tanka.md so that promtail.yml is in the correct format (grafana#1671)
  Correcte syntax of rate example (grafana#1641)
  Frontend & Querier query statistics instrumentation. (grafana#1661)
  loki-canary: fix indent of DaemonSet manifest written in .md file (grafana#1648)
  Query frontend service should be headless. (grafana#1665)
  Support custom prefix name in metrics stage (grafana#1664)
  pkg/promtail/positions: handle empty positions file (grafana#1660)
  Convert second(Integer class) to nanosecond precision (grafana#1656)
  Unite docs for fluentd plugin (grafana#1634)
  ...
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.

4 participants