Skip to content

[Journalbeat] Improve parsing of syslog.pid in journalbeat to strip the username when present #16116

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

Merged
merged 3 commits into from
Feb 10, 2020
Merged

[Journalbeat] Improve parsing of syslog.pid in journalbeat to strip the username when present #16116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c6236d
Improve parsing of syslog.pid in journalbeat to strip the username in…
blakerouse Feb 5, 2020
bc04201
Add entry to changelog with pull ID.
blakerouse Feb 5, 2020
ead30bd
Improve the comment on the username strip.
blakerouse Feb 7, 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
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Journalbeat*

- Improve parsing of syslog.pid in journalbeat to strip the username when present {pull}16116[16116]


*Metricbeat*

Expand Down
12 changes: 10 additions & 2 deletions journalbeat/reader/journal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,16 @@ func (r *Reader) convertNamedField(fc fieldConversion, value string) interface{}
if fc.isInteger {
v, err := strconv.ParseInt(value, 10, 64)
if err != nil {
r.logger.Debugf("Failed to convert field: %s \"%v\" to int: %v", fc.name, value, err)
return value
// On some versions of systemd the 'syslog.pid' can contain the username
// appended to the end of the pid. In most cases this does not occur
// but in the cases that it does, this tries to strip ',\w*' from the
// value and then perform the conversion.
s := strings.Split(value, ",")
v, err = strconv.ParseInt(s[0], 10, 64)
if err != nil {
r.logger.Debugf("Failed to convert field: %s \"%v\" to int: %v", fc.name, value, err)
return value
}
}
return v
}
Expand Down
39 changes: 39 additions & 0 deletions journalbeat/reader/journal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,45 @@ func TestToEvent(t *testing.T) {
},
},
},
// 'syslog.pid' field without user append
ToEventTestCase{
entry: sdjournal.JournalEntry{
Fields: map[string]string{
sdjournal.SD_JOURNAL_FIELD_SYSLOG_PID: "123456",
},
},
expectedFields: common.MapStr{
"syslog": common.MapStr{
"pid": int64(123456),
},
},
},
// 'syslog.pid' field with user append
ToEventTestCase{
entry: sdjournal.JournalEntry{
Fields: map[string]string{
sdjournal.SD_JOURNAL_FIELD_SYSLOG_PID: "123456,root",
},
},
expectedFields: common.MapStr{
"syslog": common.MapStr{
"pid": int64(123456),
},
},
},
// 'syslog.pid' field empty
ToEventTestCase{
entry: sdjournal.JournalEntry{
Fields: map[string]string{
sdjournal.SD_JOURNAL_FIELD_SYSLOG_PID: "",
},
},
expectedFields: common.MapStr{
"syslog": common.MapStr{
"pid": "",
},
},
},
// custom field
ToEventTestCase{
entry: sdjournal.JournalEntry{
Expand Down