github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

updating changes to pull 286

Browse source
This commit is contained in:
michael.gibson 2012-12-27 09:05:32 -07:00
parent 3066ac7f9f
commit d7505972ae
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/logstash/event.rb
View file

@ -124,7 +124,6 @@ class LogStash::Event
def tags; @data["@tags"]; end # def tags
def tags=(val); @data["@tags"] = val; end # def tags=
public
def id; @data["@id"]; end # def id
def id=(val); @data["@id"] = val; end # def id=

6
lib/logstash/outputs/elasticsearch.rb
View file

@ -38,7 +38,7 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
config :index_type, :validate => :string, :default => "%{@type}"
# The document ID for the index. Overwrites any existing entry in elasticsearch with the same ID.
config :id, :validate => :string, :default => ""
config :id, :validate => :string, :default => nil
# The name of your cluster if you set it on the ElasticSearch side. Useful
# for discovery.
@ -143,7 +143,6 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
index = event.sprintf(@index)
type = event.sprintf(@index_type)
id = event.sprintf(@id)
# TODO(sissel): allow specifying the ID?
# The document ID is how elasticsearch determines sharding hash, so it can
# help performance if we allow folks to specify a specific ID.
@ -164,9 +163,10 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
end
end
if id == "%{@id}"
if id.nil?
req = @client.index(index, type, event.to_hash)
else
id = event.sprintf(@id)
req = @client.index(index, type, id, event.to_hash)
end