mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 22:57:16 -04:00
Add missing decorate() calls to inputs.
This commit is contained in:
parent
b82818e286
commit
a03a643833
14 changed files with 16 additions and 0 deletions
|
@ -205,6 +205,7 @@ class LogStash::Inputs::DrupalDblog < LogStash::Inputs::Base
|
||||||
results.each do |row|
|
results.each do |row|
|
||||||
event = build_event(row)
|
event = build_event(row)
|
||||||
if event
|
if event
|
||||||
|
decorate(event)
|
||||||
output_queue << event
|
output_queue << event
|
||||||
lastWid = row['wid'].to_s
|
lastWid = row['wid'].to_s
|
||||||
end
|
end
|
||||||
|
|
|
@ -84,6 +84,7 @@ class LogStash::Inputs::EventLog < LogStash::Inputs::Base
|
||||||
|
|
||||||
e.message = event.Message
|
e.message = event.Message
|
||||||
|
|
||||||
|
decorate(e)
|
||||||
queue << e
|
queue << e
|
||||||
|
|
||||||
end # while
|
end # while
|
||||||
|
|
|
@ -88,6 +88,7 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
|
||||||
event.remove("timestamp")
|
event.remove("timestamp")
|
||||||
end
|
end
|
||||||
remap_gelf(event) if @remap
|
remap_gelf(event) if @remap
|
||||||
|
decorate(event)
|
||||||
output_queue << event
|
output_queue << event
|
||||||
end
|
end
|
||||||
rescue LogStash::ShutdownSignal
|
rescue LogStash::ShutdownSignal
|
||||||
|
|
|
@ -77,6 +77,7 @@ class LogStash::Inputs::Generator < LogStash::Inputs::Threadable
|
||||||
|
|
||||||
if @codec.respond_to?(:flush)
|
if @codec.respond_to?(:flush)
|
||||||
@codec.flush do |event|
|
@codec.flush do |event|
|
||||||
|
decorate(event)
|
||||||
event["host"] = @hos
|
event["host"] = @hos
|
||||||
queue << event
|
queue << event
|
||||||
end
|
end
|
||||||
|
@ -87,6 +88,7 @@ class LogStash::Inputs::Generator < LogStash::Inputs::Threadable
|
||||||
public
|
public
|
||||||
def teardown
|
def teardown
|
||||||
@codec.flush do |event|
|
@codec.flush do |event|
|
||||||
|
decorate(event)
|
||||||
event["source"] = source
|
event["source"] = source
|
||||||
queue << event
|
queue << event
|
||||||
end
|
end
|
||||||
|
|
|
@ -113,6 +113,8 @@ class LogStash::Inputs::IMAP < LogStash::Inputs::Base
|
||||||
end
|
end
|
||||||
end # mail.header_fields.each
|
end # mail.header_fields.each
|
||||||
|
|
||||||
|
decorate(event)
|
||||||
|
|
||||||
return event
|
return event
|
||||||
end # def handle
|
end # def handle
|
||||||
|
|
||||||
|
|
|
@ -57,6 +57,7 @@ class LogStash::Inputs::Log4j < LogStash::Inputs::Base
|
||||||
log4j_obj = ois.readObject
|
log4j_obj = ois.readObject
|
||||||
event = LogStash::Event.new("message" => log4j_obj.getRenderedMessage,
|
event = LogStash::Event.new("message" => log4j_obj.getRenderedMessage,
|
||||||
"source" => event_source)
|
"source" => event_source)
|
||||||
|
decorate(event)
|
||||||
event["host"] = socket.peer
|
event["host"] = socket.peer
|
||||||
event["path"] = log4j_obj.getLoggerName
|
event["path"] = log4j_obj.getLoggerName
|
||||||
event["priority"] = log4j_obj.getLevel.toString
|
event["priority"] = log4j_obj.getLevel.toString
|
||||||
|
|
|
@ -70,6 +70,7 @@ class LogStash::Inputs::Snmptrap < LogStash::Inputs::Base
|
||||||
@snmptrap.on_trap_default do |trap|
|
@snmptrap.on_trap_default do |trap|
|
||||||
begin
|
begin
|
||||||
event = LogStash::Event.new("message" => trap.inspect, "host" => trap.source_ip)
|
event = LogStash::Event.new("message" => trap.inspect, "host" => trap.source_ip)
|
||||||
|
decorate(event)
|
||||||
trap.each_varbind do |vb|
|
trap.each_varbind do |vb|
|
||||||
event[vb.name.to_s] = vb.value.to_s
|
event[vb.name.to_s] = vb.value.to_s
|
||||||
end
|
end
|
||||||
|
|
|
@ -154,6 +154,7 @@ class LogStash::Inputs::Sqlite < LogStash::Inputs::Base
|
||||||
count += rows.count
|
count += rows.count
|
||||||
rows.each do |row|
|
rows.each do |row|
|
||||||
event = LogStash::Event.new("host" => @host, "db" => @db)
|
event = LogStash::Event.new("host" => @host, "db" => @db)
|
||||||
|
decorate(event)
|
||||||
# store each column as a field in the event.
|
# store each column as a field in the event.
|
||||||
row.each do |column, element|
|
row.each do |column, element|
|
||||||
next if column == :id
|
next if column == :id
|
||||||
|
|
|
@ -142,6 +142,7 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
||||||
begin
|
begin
|
||||||
client.each do |line|
|
client.each do |line|
|
||||||
@codec.decode(line) do |event|
|
@codec.decode(line) do |event|
|
||||||
|
decorate(event)
|
||||||
event["host"] = ip
|
event["host"] = ip
|
||||||
syslog_relay(event)
|
syslog_relay(event)
|
||||||
output_queue << event
|
output_queue << event
|
||||||
|
|
|
@ -118,6 +118,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
|
||||||
end # loop do
|
end # loop do
|
||||||
rescue => e
|
rescue => e
|
||||||
codec.respond_to?(:flush) && codec.flush do |event|
|
codec.respond_to?(:flush) && codec.flush do |event|
|
||||||
|
decorate(event)
|
||||||
event["source"] = event_source
|
event["source"] = event_source
|
||||||
event["sslsubject"] = socket.peer_cert.subject if @ssl_enable && @ssl_verify
|
event["sslsubject"] = socket.peer_cert.subject if @ssl_enable && @ssl_verify
|
||||||
output_queue << event
|
output_queue << event
|
||||||
|
|
|
@ -73,6 +73,7 @@ class LogStash::Inputs::Twitter < LogStash::Inputs::Base
|
||||||
"client" => status.source,
|
"client" => status.source,
|
||||||
"retweeted" => status.retweeted
|
"retweeted" => status.retweeted
|
||||||
)
|
)
|
||||||
|
decorate(event)
|
||||||
event["in-reply-to"] = status.in_reply_to_status_id if status.in_reply_to_status_id
|
event["in-reply-to"] = status.in_reply_to_status_id if status.in_reply_to_status_id
|
||||||
#urls = tweet.urls.collect(&:expanded_url)
|
#urls = tweet.urls.collect(&:expanded_url)
|
||||||
#event["urls"] = urls if urls.size > 0
|
#event["urls"] = urls if urls.size > 0
|
||||||
|
|
|
@ -27,6 +27,7 @@ class LogStash::Inputs::Varnishlog < LogStash::Inputs::Threadable
|
||||||
begin
|
begin
|
||||||
str = ptr.read_string(len)
|
str = ptr.read_string(len)
|
||||||
event = LogStash::Event.new("message" => str, "host" => @host)
|
event = LogStash::Event.new("message" => str, "host" => @host)
|
||||||
|
decorate(event)
|
||||||
event["varnish_tag"] = tag
|
event["varnish_tag"] = tag
|
||||||
event["varnish_fd"] = fd
|
event["varnish_fd"] = fd
|
||||||
event["varnish_spec"] = spec
|
event["varnish_spec"] = spec
|
||||||
|
|
|
@ -66,6 +66,7 @@ class LogStash::Inputs::Xmpp < LogStash::Inputs::Base
|
||||||
# accept normal msgs (skip presence updates, etc)
|
# accept normal msgs (skip presence updates, etc)
|
||||||
if msg.body != nil
|
if msg.body != nil
|
||||||
@codec.decode(msg.body) do |event|
|
@codec.decode(msg.body) do |event|
|
||||||
|
decorate(event)
|
||||||
# Maybe "from" should just be a hash:
|
# Maybe "from" should just be a hash:
|
||||||
# { "node" => ..., "domain" => ..., "resource" => ... }
|
# { "node" => ..., "domain" => ..., "resource" => ... }
|
||||||
event["from"] = "#{msg.from.node}@#{msg.from.domain}/#{msg.from.resource}"
|
event["from"] = "#{msg.from.node}@#{msg.from.domain}/#{msg.from.resource}"
|
||||||
|
|
|
@ -83,6 +83,7 @@ class LogStash::Inputs::Zenoss < LogStash::Inputs::RabbitMQ
|
||||||
"host" => occurrence.actor.element_title,
|
"host" => occurrence.actor.element_title,
|
||||||
"message" => occurrence.message,
|
"message" => occurrence.message,
|
||||||
)
|
)
|
||||||
|
decorate(event)
|
||||||
|
|
||||||
# Direct mappings from summary.
|
# Direct mappings from summary.
|
||||||
%w{uuid}.each do |property|
|
%w{uuid}.each do |property|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue