fluent-plugin-elasticsearch 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8996e6467b32911e04aee292d62260af99fbb0c
-  data.tar.gz: e9a20b223483d5ec1662b191dc85f2153f63da09
+  metadata.gz: db7ae2774a9228b9590ed370a165dce4b02cffb9
+  data.tar.gz: 0a3fdd28683a0c7a63169b2ed9b9188876d205f2
 SHA512:
-  metadata.gz: 3d4e373bf3a028d3756ac00390231a292af88e58742eb5b3686152a47ca50908abc118421a2318f4ba4d800b4d6995894a42081f1b2737afc5b0c56650b1b725
-  data.tar.gz: 1ffdf80eb1094f23883a69bf1688450d921e0c1c777e10eb73870df52146979e85b6c7c2ab5f5ab27b16fe02c900a8f7f4c711a8a89d3a27f5bde336d67b470c
+  metadata.gz: 97264a9bd9817e7cd4b43e413f6ac492d61dfac495256008209f08453db1f889a188c2f46d15c674c9c619fc488deeec343169312f01daabd6654b7d31d06586
+  data.tar.gz: 42f10a91ad47b1927411cef10ddd33d093b7e56608940feb3e032c06110945b74c7d1484bcc6d1a5a136d4c59ceb85912f4ebfcc1d85cc83f2586b6e6b706041

data/History.md

@@ -2,6 +2,9 @@
 
 ### Future
 
+### 0.7.0
+- Add new option `time_key` (#85)
+
 ### 0.6.1
 - 0.10.43 is minimum version required of fluentd (#79)
 

data/README.md

@@ -79,6 +79,32 @@ By default, when inserting records in logstash format, @timestamp is dynamically
 {"@timestamp":"2014-04-07T000:00:00-00:00"}
 ```
 
+You can specify an option `time_key` (like the option described in [tail Input Plugin](http://docs.fluentd.org/articles/in_tail)) if you don't like `@timestamp`.
+
+Suppose you have settings
+
+```
+logstash_format true
+time_key vtm
+```
+
+Your input is:
+```
+{
+  "title": "developer",
+  "vtm": "2014-12-19T08:01:03Z"
+}
+```
+
+The output will be
+```
+{
+  "title": "developer",
+  "@timstamp": "2014-12-19T08:01:03Z",
+  "vtm": "2014-12-19T08:01:03Z"
+}
+```
+
 By default, the records inserted into index `logstash-YYMMDD`. This option allows to insert into specified index like `logstash-YYYYMM` for a monthly index.
 
 ```

data/fluent-plugin-elasticsearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-elasticsearch'
-  s.version       = '0.6.1'
+  s.version       = '0.7.0'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr@uken.com', 'diogo@uken.com']
   s.description   = %q{ElasticSearch output plugin for Fluent event collector}

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -27,6 +27,7 @@ class Fluent::ElasticsearchOutput < Fluent::BufferedOutput
   config_param :request_timeout, :time, :default => 5
   config_param :reload_connections, :bool, :default => true
   config_param :reload_on_failure, :bool, :default => false
+  config_param :time_key, :string, :default => nil
 
   include Fluent::SetTagKeyMixin
   config_set_default :include_tag_key, false
@@ -125,6 +126,9 @@ class Fluent::ElasticsearchOutput < Fluent::BufferedOutput
       if @logstash_format
         if record.has_key?("@timestamp")
           time = Time.parse record["@timestamp"]
+        elsif record.has_key?(@time_key)
+          time = Time.parse record[@time_key]
+          record['@timestamp'] = record[@time_key]
         else
           record.merge!({"@timestamp" => Time.at(time).to_datetime.to_s})
         end

data/test/plugin/test_out_elasticsearch.rb

@@ -30,7 +30,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
   end
 
   def stub_elastic_ping(url="http://localhost:9200")
-    stub_request(:head, url).with.to_return(:status => 200, :body => "", :headers => {})
+    stub_request(:head, url).to_return(:status => 200, :body => "", :headers => {})
   end
 
   def stub_elastic(url="http://localhost:9200/_bulk")
@@ -333,6 +333,18 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_equal(index_cmds[1]['@timestamp'], ts)
   end
 
+  def test_uses_custom_time_key
+    driver.configure("logstash_format true
+                      time_key vtm\n")
+    stub_elastic_ping
+    stub_elastic
+    ts = DateTime.new(2001,2,3).to_s
+    driver.emit(sample_record.merge!('vtm' => ts))
+    driver.run
+    assert(index_cmds[1].has_key? '@timestamp')
+    assert_equal(index_cmds[1]['@timestamp'], ts)
+  end
+
   def test_doesnt_add_tag_key_by_default
     stub_elastic_ping
     stub_elastic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd