fluent-plugin-out-solr 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fba370cfa9aa095c4d62a31298fb5986d7e82c3
-  data.tar.gz: bc3e47a0617809a5ccee18e9811eb3832eef63f5
+  metadata.gz: 084cfbcff140583951af85f95686ce9b1cce218a
+  data.tar.gz: b76871e6609e4b256ae5a7c2e1657bf5a29c894f
 SHA512:
-  metadata.gz: 58b5f2a164b2851f917843e29b70db8fc91d160c887441bb66969011a64727da40b93809d47c8620d32153fbb319a9b807cff48b0affbe3fc05172fd25576e66
-  data.tar.gz: 982239392497f4e9a88e9bfdc5f93ef404fe58c4b7d7e215220c3ba78996e4f02dfcb6f891d3e5daaf10bcfa174d9d159903ccca89a361d9d18d8a721bef2157
+  metadata.gz: f1bb5193a19f3689a040114fa4d515ad19f5b7cbc3779139632bbeadb57355b5b1db604c9d192d52131904ad30f3c63aa09ffa13722fee37498da4a8ba6ca2f8
+  data.tar.gz: 68b6b924c039f2b5c77f6254c5ee2c60907265a6974141b4f7d14cf1a1c2e205f724b88d7eb73aeb2530d1b5780ccf972cd767c9bd78dfe8fa0b039af3c93e41

data/README.md

@@ -30,7 +30,8 @@ Notice: no relationship with [btigit/fluent-plugin-solr](https://github.com/btig
   include_tag_key true
   tag_key tag
   time_field timestamp
-  utc # if you do not want to use localtime
+#  utc # if you do not want to use localtime
+#  commit true # if you want to commit explicitly
 
   flush_interval 3s
 </match>
@@ -58,7 +59,8 @@ See: [Time Sliced Plugin Overview - Buffer Plugin Overview | Fluentd](http://doc
   include_tag_key true
   tag_key tag
   time_field timestamp
-  utc # if you do not want to use localtime
+#  utc # if you do not want to use localtime
+#  commit true # if you want to commit explicitly
 
   flush_interval 3s
 </match>

data/fluent-plugin-out-solr.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-out-solr'
-  s.version       = '0.0.4'
+  s.version       = '0.0.5'
   s.authors       = ['diogo', 'pitr', 'haruyama']
   s.email         = ['team@uken.com', 'haruyama@unixuser.org']
   s.description   = %q{Solr output plugin for Fluent event collector}

data/lib/fluent/plugin/out_solr.rb

@@ -6,16 +6,11 @@ class Fluent::SolrOutput < Fluent::BufferedOutput
 
   require 'fluent/plugin/solr_util'
   include SolrUtil
+  require 'fluent/plugin/solr_config_common'
+  include SolrConfigCommon
 
-  config_param :host,              :string,  default: 'localhost'
-  config_param :port,              :integer, default: 8983
-  config_param :core,              :string,  default: 'collection1'
-  config_param :time_field,        :string,  default: 'timestamp'
+  config_param :core, :string,  default: 'collection1'
 
-  include Fluent::SetTagKeyMixin
-  config_set_default :include_tag_key, false
-
-  attr_accessor :localtime
   def initialize
     require 'net/http'
     require 'uri'

data/lib/fluent/plugin/out_solr_time_sliced.rb

@@ -6,19 +6,13 @@ class Fluent::SolrTimeSlicedOutput < Fluent::TimeSlicedOutput
 
   require 'fluent/plugin/solr_util'
   include SolrUtil
+  require 'fluent/plugin/solr_config_common'
+  include SolrConfigCommon
 
   config_set_default :buffer_type,       'memory'
   config_set_default :time_slice_format, '%Y%m%d'
 
-  config_param :host,              :string,  default: 'localhost'
-  config_param :port,              :integer, default: 8983
-  config_param :core,              :string,  default: 'log-%Y%m%d'
-  config_param :time_field,        :string,  default: 'timestamp'
-
-  include Fluent::SetTagKeyMixin
-  config_set_default :include_tag_key, false
-
-  attr_accessor :localtime
+  config_param :core, :string,  default: 'log-%Y%m%d'
 
   def initialize
     require 'net/http'

data/lib/fluent/plugin/solr_config_common.rb

@@ -0,0 +1,17 @@
+# encoding: UTF-8
+
+require 'fluent/config'
+
+# Solr Config Common
+module SolrConfigCommon
+  include Fluent::Configurable
+  config_param :host,       :string,  default: 'localhost'
+  config_param :port,       :integer, default: 8983
+  config_param :time_field, :string,  default: 'timestamp'
+  config_param :commit,     :bool,    default: false
+
+  include Fluent::SetTagKeyMixin
+  config_set_default :include_tag_key, false
+
+  attr_accessor :localtime
+end

data/lib/fluent/plugin/solr_util.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require 'uri'
+
 # Solr utility
 module SolrUtil
   def update_core(chunk, core)
@@ -14,7 +16,9 @@ module SolrUtil
     end
 
     http = Net::HTTP.new(@host, @port.to_i)
-    request = Net::HTTP::Post.new('/solr/' + URI.escape(core) + '/update', 'content-type' => 'application/json; charset=utf-8')
+    url = '/solr/' + URI.escape(core) + '/update'
+    url += '?commit=true' if @commit
+    request = Net::HTTP::Post.new(url, 'content-type' => 'application/json; charset=utf-8')
     request.body = Yajl::Encoder.encode(documents)
     http.request(request).value
   end

data/test/plugin/test_out_solr.rb

@@ -123,4 +123,12 @@ class SolrOutput < Test::Unit::TestCase
       driver.run
     end
   end
+
+  def test_writes_with_commit
+    driver.configure("commit true\n")
+    solr_request = stub_solr('http://localhost:8983/solr/collection1/update?commit=true')
+    driver.emit(sample_record)
+    driver.run
+    assert_requested(solr_request)
+  end
 end

data/test/plugin/test_out_solr_time_sliced.rb

@@ -67,7 +67,7 @@ class SolrTimeSlicedOutputTest < Test::Unit::TestCase
 
   def test_wrties_with_proper_content_type
     stub_solr
-    driver.emit(sample_record)
+    driver.emit(sample_record, time)
     driver.run
     assert_equal('application/json; charset=utf-8', @content_type)
   end
@@ -124,7 +124,7 @@ class SolrTimeSlicedOutputTest < Test::Unit::TestCase
 
   def test_doesnt_add_tag_key_by_default
     stub_solr
-    driver.emit(sample_record)
+    driver.emit(sample_record, time)
     driver.run
     assert_nil(@index_cmds[0]['tag'])
   end
@@ -148,6 +148,16 @@ class SolrTimeSlicedOutputTest < Test::Unit::TestCase
     assert_equal('2013-12-21T22:30:00Z', @index_cmds[0]['timestamp'])
   end
 
+  def test_utc2
+    driver.configure("utc\n")
+    stub_solr2
+    ENV['TZ'] = 'Europe/Berlin'
+    driver.emit(sample_record, Time.local(2013, 12, 22, 7, 30, 0).to_i)
+    ENV['TZ'] = nil
+    driver.run
+    assert_equal('2013-12-22T06:30:00Z', @index_cmds2[0]['timestamp'])
+  end
+
   def test_emit_records_on_different_days
     stub_solr
     stub_solr2
@@ -165,4 +175,12 @@ class SolrTimeSlicedOutputTest < Test::Unit::TestCase
       driver.run
     end
   end
+
+  def test_writes_with_commit
+    driver.configure("commit true\n")
+    solr_request = stub_solr('http://localhost:8983/solr/log-20131221/update?commit=true')
+    driver.emit(sample_record, time)
+    driver.run
+    assert_requested(solr_request)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-solr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - diogo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -70,6 +70,7 @@ files:
 - fluent-plugin-out-solr.gemspec
 - lib/fluent/plugin/out_solr.rb
 - lib/fluent/plugin/out_solr_time_sliced.rb
+- lib/fluent/plugin/solr_config_common.rb
 - lib/fluent/plugin/solr_util.rb
 - test/helper.rb
 - test/plugin/.rubocop.yml
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Solr output plugin for Fluent event collector