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

Add tag "truncated" to "log.flags" if incoming line is longer than configured limit #7991

Merged
merged 16 commits into from
Aug 30, 2018
Merged

Add tag "truncated" to "log.flags" if incoming line is longer than configured limit #7991

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5aaadff
provide arbitrary name for tags
kvch Aug 27, 2018
e13ab92
add function to add tag to a message
kvch Aug 27, 2018
a81626a
add truncated flag in LimitReader
kvch Aug 27, 2018
af7c81d
add "truncated" flag to MultilineReader
kvch Aug 27, 2018
f8eb9c7
add documentation for log.status
kvch Aug 27, 2018
b16cff8
add changelog entry
kvch Aug 27, 2018
84584c5
feed the hound with comments
kvch Aug 27, 2018
03ee796
rename reciever
kvch Aug 27, 2018
496ebe4
fix variable
kvch Aug 27, 2018
a01440c
rm debug print
kvch Aug 27, 2018
b9aa508
make AddTagsWithKey variadic function
kvch Aug 28, 2018
cd0561e
rename d to subMap
kvch Aug 28, 2018
43b8c57
address review notes
kvch Aug 30, 2018
da33c4d
feed the hound
kvch Aug 30, 2018
2870f20
add AddTagsWithKey to developer changelog
kvch Aug 30, 2018
5d8cb05
follow up changelog
kvch Aug 30, 2018
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
fix variable
  • Loading branch information
@kvch
kvch committed Aug 27, 2018
commit 496ebe4ff288a5a6ef9b82757d3a8b5dd92f1c61
12 changes: 6 additions & 6 deletions filebeat/reader/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ func (m *Message) AddFields(fields common.MapStr) {
return
}

if msg.Fields == nil {
msg.Fields = common.MapStr{}
if m.Fields == nil {
m.Fields = common.MapStr{}
}
msg.Fields.Update(fields)
m.Fields.Update(fields)
}

// AddTagsWithKey adds tags to the message with an arbitrary key.
Copy link

Choose a reason for hiding this comment

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

comment on exported method Message.AddFlagsWithKey should be of the form "AddFlagsWithKey ..."

Expand All @@ -68,9 +68,9 @@ func (m *Message) AddTagsWithKey(key string, tags []string) error {
return nil
}

if msg.Fields == nil {
msg.Fields = common.MapStr{}
if m.Fields == nil {
m.Fields = common.MapStr{}
}

return common.AddTagsWithKey(msg.Fields, key, tags)
return common.AddTagsWithKey(m.Fields, key, tags)
}