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

Cherry-pick #9994 to 6.x: Do not stop collecting events when journal entries change #10485

Merged
merged 8 commits into from
Feb 4, 2019
+329 −189
Merged

Cherry-pick #9994 to 6.x: Do not stop collecting events when journal entries change #10485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5703e3a
Revert "Minor Journalbeat fixes and additions (#8973) (#9007)"
kvch Nov 9, 2018
36e614a
Merge branch '6.x' of github.com:elastic/beats into 6.x
kvch Nov 19, 2018
81a720f
Merge branch '6.x' of github.com:elastic/beats into 6.x
kvch Nov 27, 2018
db1d4fa
Merge branch '6.x' of github.com:elastic/beats into 6.x
kvch Nov 28, 2018
bb1eecf
Merge branch '6.x' of github.com:elastic/beats into 6.x
kvch Nov 28, 2018
2dd9a61
Merge branch '6.x' of github.com:elastic/beats into 6.x
kvch Jan 7, 2019
5c635b0
Merge branch '6.x' of github.com:elastic/beats into 6.x
kvch Feb 1, 2019
9db33a4
Do not stop collecting events when journal entries change (#9994)
kvch Jan 28, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
*Journalbeat*

- Add missing journalbeat non breaking fixes. {pull}9106[9106]
- Do not stop collecting events when journal entries change. {pull}9994[9994]

*Metricbeat*

Expand Down
169 changes: 0 additions & 169 deletions journalbeat/_meta/kibana/6/dashboard/Journalbeat-overview.json
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions journalbeat/beater/journalbeat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/elastic/beats/libbeat/logp"

conf "github.com/elastic/beats/journalbeat/config"
_ "github.com/elastic/beats/journalbeat/include"
)

// Journalbeat instance
Expand Down
122 changes: 122 additions & 0 deletions journalbeat/include/seccomp_linux_386.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading