Add missing decorate() calls to inputs.

This commit is contained in:
Bernd Ahlers 2013-08-31 13:47:51 +02:00
parent b82818e286
commit a03a643833
14 changed files with 16 additions and 0 deletions

View file

@ -205,6 +205,7 @@ class LogStash::Inputs::DrupalDblog < LogStash::Inputs::Base
results.each do |row|
event = build_event(row)
if event
decorate(event)
output_queue << event
lastWid = row['wid'].to_s
end

View file

@ -84,6 +84,7 @@ class LogStash::Inputs::EventLog < LogStash::Inputs::Base
e.message = event.Message
decorate(e)
queue << e
end # while

View file

@ -88,6 +88,7 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
event.remove("timestamp")
end
remap_gelf(event) if @remap
decorate(event)
output_queue << event
end
rescue LogStash::ShutdownSignal

View file

@ -77,6 +77,7 @@ class LogStash::Inputs::Generator < LogStash::Inputs::Threadable
if @codec.respond_to?(:flush)
@codec.flush do |event|
decorate(event)
event["host"] = @hos
queue << event
end
@ -87,6 +88,7 @@ class LogStash::Inputs::Generator < LogStash::Inputs::Threadable
public
def teardown
@codec.flush do |event|
decorate(event)
event["source"] = source
queue << event
end

View file

@ -113,6 +113,8 @@ class LogStash::Inputs::IMAP < LogStash::Inputs::Base
end
end # mail.header_fields.each
decorate(event)
return event
end # def handle

View file

@ -57,6 +57,7 @@ class LogStash::Inputs::Log4j < LogStash::Inputs::Base
log4j_obj = ois.readObject
event = LogStash::Event.new("message" => log4j_obj.getRenderedMessage,
"source" => event_source)
decorate(event)
event["host"] = socket.peer
event["path"] = log4j_obj.getLoggerName
event["priority"] = log4j_obj.getLevel.toString

View file

@ -70,6 +70,7 @@ class LogStash::Inputs::Snmptrap < LogStash::Inputs::Base
@snmptrap.on_trap_default do |trap|
begin
event = LogStash::Event.new("message" => trap.inspect, "host" => trap.source_ip)
decorate(event)
trap.each_varbind do |vb|
event[vb.name.to_s] = vb.value.to_s
end

View file

@ -154,6 +154,7 @@ class LogStash::Inputs::Sqlite < LogStash::Inputs::Base
count += rows.count
rows.each do |row|
event = LogStash::Event.new("host" => @host, "db" => @db)
decorate(event)
# store each column as a field in the event.
row.each do |column, element|
next if column == :id

View file

@ -142,6 +142,7 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
begin
client.each do |line|
@codec.decode(line) do |event|
decorate(event)
event["host"] = ip
syslog_relay(event)
output_queue << event

View file

@ -118,6 +118,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
end # loop do
rescue => e
codec.respond_to?(:flush) && codec.flush do |event|
decorate(event)
event["source"] = event_source
event["sslsubject"] = socket.peer_cert.subject if @ssl_enable && @ssl_verify
output_queue << event

View file

@ -73,6 +73,7 @@ class LogStash::Inputs::Twitter < LogStash::Inputs::Base
"client" => status.source,
"retweeted" => status.retweeted
)
decorate(event)
event["in-reply-to"] = status.in_reply_to_status_id if status.in_reply_to_status_id
#urls = tweet.urls.collect(&:expanded_url)
#event["urls"] = urls if urls.size > 0

View file

@ -27,6 +27,7 @@ class LogStash::Inputs::Varnishlog < LogStash::Inputs::Threadable
begin
str = ptr.read_string(len)
event = LogStash::Event.new("message" => str, "host" => @host)
decorate(event)
event["varnish_tag"] = tag
event["varnish_fd"] = fd
event["varnish_spec"] = spec

View file

@ -66,6 +66,7 @@ class LogStash::Inputs::Xmpp < LogStash::Inputs::Base
# accept normal msgs (skip presence updates, etc)
if msg.body != nil
@codec.decode(msg.body) do |event|
decorate(event)
# Maybe "from" should just be a hash:
# { "node" => ..., "domain" => ..., "resource" => ... }
event["from"] = "#{msg.from.node}@#{msg.from.domain}/#{msg.from.resource}"

View file

@ -83,6 +83,7 @@ class LogStash::Inputs::Zenoss < LogStash::Inputs::RabbitMQ
"host" => occurrence.actor.element_title,
"message" => occurrence.message,
)
decorate(event)
# Direct mappings from summary.
%w{uuid}.each do |property|