Skip to content

Attempt to support tags in ToLogstash #13

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

Open
omega wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Attempt to support tags in ToLogstash #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions lib/Message/Passing/Filter/ToLogstash.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ sub filter {
if (exists($message->{'@fields'}{epochtime})) {
$message->{'@timestamp'} = DateTime->from_epoch(epoch => delete($message->{'@fields'}{epochtime})) . ''
}
if (exists($message->{'@fields'}->{'tags'})) {
# we move tags here, to keep the loop simpler
$message->{'@tags'} = delete $message->{'@fields'}->{tags};
}
foreach my $k (keys %map) {
my $v = $map{$k};
$v = [ '', $v ] if !ref $v;
Expand All @@ -55,6 +59,10 @@ sub filter {
$message->{$field} = $prefix . delete $message->{'@fields'}{$k};
}
}
if ($message->{'@tags'} and ref $message->{'@tags'} ne ref []) {
# We have something in tags that isn't a ref, lets wrap it
$message->{'@tags'} = [ $message->{'@tags'} ];
}
$message->{'@tags'} ||= $self->default_tags;
$message->{'@tags'} = [ uniq @{ $message->{'@tags'} }, @{ $self->add_tags } ];

Expand Down
10 changes: 10 additions & 0 deletions t/filter_tologstash.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@ my @data = (
{ date => '2012-09-03T21:08:54', message => 'foo',},
{ '@fields' => {}, '@tags' => [], '@message' => 'foo', '@timestamp' => '2012-09-03T21:08:54' },
],
[
'one tag',
{ tags => 'foo', message => 'foo' },
{ '@fields' => {}, '@tags' => [ 'foo' ], '@message' => 'foo' },
],
[
'two tags',
{ tags => ['foo', 'bar'], message => 'foo' },
{ '@fields' => {}, '@tags' => [ 'foo', 'bar' ], '@message' => 'foo' },
],
);

foreach my $datum (@data) {
Expand Down