mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 22:57:16 -04:00
Make the timestamp optional to support some really old syslog daemons.
This commit is contained in:
parent
35d0c0b3c6
commit
5bcdffa4f6
1 changed files with 7 additions and 5 deletions
|
@ -34,11 +34,11 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
||||||
public
|
public
|
||||||
def register
|
def register
|
||||||
# This comes from RFC3164, mostly.
|
# This comes from RFC3164, mostly.
|
||||||
# Optional fields (priority, host) are because some syslog implementations
|
# Optional fields (priority, host, timestamp) are because some syslog implementations
|
||||||
# don't send these under some circumstances.
|
# don't send these under some circumstances.
|
||||||
@@syslog_re ||= \
|
@@syslog_re ||= \
|
||||||
/(?:<([0-9]{1,3})>)?([A-z]{3} ?[0-9]{1,2} [0-9]{2}:[0-9]{2}:[0-9]{2}) (?:(\S*[^ :]) )?(.*)/
|
/(?:<([0-9]{1,3})>)?(?:([A-z]{3} ?[0-9]{1,2} [0-9]{2}:[0-9]{2}:[0-9]{2}) )?(?:(\S*[^ :]) )?(.*)/
|
||||||
# <priority> timestamp Mmm dd hh:mm:ss host msg
|
# <priority> timestamp Mmm dd hh:mm:ss host msg
|
||||||
|
|
||||||
@tcp_clients = []
|
@tcp_clients = []
|
||||||
end # def register
|
end # def register
|
||||||
|
@ -161,8 +161,10 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
||||||
host = match[3]
|
host = match[3]
|
||||||
|
|
||||||
# TODO(sissel): Use the date filter, somehow.
|
# TODO(sissel): Use the date filter, somehow.
|
||||||
event.timestamp = LogStash::Time.to_iso8601(
|
if !match[2].nil?
|
||||||
DateTime.strptime(match[2], "%b %d %H:%M:%S"))
|
event.timestamp = LogStash::Time.to_iso8601(
|
||||||
|
DateTime.strptime(match[2], "%b %d %H:%M:%S"))
|
||||||
|
end
|
||||||
|
|
||||||
# Hostname is optional, use if present in message, otherwise use source
|
# Hostname is optional, use if present in message, otherwise use source
|
||||||
# address of message.
|
# address of message.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue