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.

Sign up for GitHub

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

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d5b5ab6
--dry-run Promtail.
cyriltovena Feb 6, 2020
eea212f
Remove changed on gomod
cyriltovena Feb 6, 2020
fc8248b
Fixes flaky test
cyriltovena Feb 6, 2020
79dc092
Merge remote-tracking branch 'upstream/master' into dry-run
cyriltovena Feb 11, 2020
783efec
Ensure position file is readonly when doing dry-run
cyriltovena Feb 11, 2020
d09bc1e
Add information about dry run mode in the troubleshooting section.
cyriltovena Feb 11, 2020
9f1e4cd
Add more spaces.
cyriltovena Feb 11, 2020
7c9b0ad
Fixes journaltarget refactor.
cyriltovena Feb 11, 2020
b2e5975
Fixes journaltarget refactor.
cyriltovena Feb 11, 2020
35e4a8e
Fixes journaltarget refactor.
cyriltovena Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes journaltarget refactor. 
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
  • Loading branch information
@cyriltovena
cyriltovena committed Feb 11, 2020
commit 7c9b0ad7a1f1d435bda566a2aaac564471ab271c
6 changes: 3 additions & 3 deletions pkg/promtail/targets/journaltarget.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ var defaultJournalEntryFunc = func(c sdjournal.JournalReaderConfig, cursor strin
type JournalTarget struct {
logger log.Logger
handler api.EntryHandler
positions *positions.Positions
positions positions.Positions
positionPath string
relabelConfig []*relabel.Config
config *scrape.JournalTargetConfig
Expand All @@ -92,7 +92,7 @@ type JournalTarget struct {
func NewJournalTarget(
logger log.Logger,
handler api.EntryHandler,
positions *positions.Positions,
positions positions.Positions,
jobName string,
relabelConfig []*relabel.Config,
targetConfig *scrape.JournalTargetConfig,
Expand All @@ -113,7 +113,7 @@ func NewJournalTarget(
func journalTargetWithReader(
logger log.Logger,
handler api.EntryHandler,
positions *positions.Positions,
positions positions.Positions,
jobName string,
relabelConfig []*relabel.Config,
targetConfig *scrape.JournalTargetConfig,
Expand Down