fluent-plugin-elasticsearch 0.1.2 → 0.1.4

data/History.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+0.1.4
+=====
+
+- add logstash_prefix option
+
+0.1.3
+=====
+
+- raising an exception on non-success response from elasticsearch
+
 0.1.2
 =====
 

data/README.md

@@ -26,6 +26,12 @@ logstash_format true # defaults to false
 
 This is meant to make writing data into elasticsearch compatible to what logstash writes. By doing this, one could take advantade of [kibana](http://kibana.org/).
 
+```
+logstash_prefix mylogs # defaults to "logstash"
+```
+
+By default, the records inserted into index `logstash-YYMMDD`. This option allows to insert into specified index like `mylogs-YYMMDD`.
+
 ---
 
 ```

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.1.2'
+  s.version       = '0.1.4'
   s.authors       = ["diogo", 'pitr']
   s.email         = ["team@uken.com"]
   s.description   = %q{ElasticSearch output plugin for Fluent event collector}

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -8,6 +8,7 @@ class Fluent::ElasticsearchOutput < Fluent::BufferedOutput
   config_param :host, :string,  :default => 'localhost'
   config_param :port, :integer, :default => 9200
   config_param :logstash_format, :bool, :default => false
+  config_param :logstash_prefix, :string, :default => "logstash"
   config_param :type_name, :string, :default => "fluentd"
   config_param :index_name, :string, :default => "fluentd"
   config_param :id_key, :string, :default => nil
@@ -41,7 +42,7 @@ class Fluent::ElasticsearchOutput < Fluent::BufferedOutput
     chunk.msgpack_each do |tag, time, record|
       if @logstash_format
         record.merge!({"@timestamp" => Time.at(time).to_datetime.to_s})
-        target_index = "logstash-#{Time.at(time).getutc.strftime("%Y.%m.%d")}"
+        target_index = "#{@logstash_prefix}-#{Time.at(time).getutc.strftime("%Y.%m.%d")}"
       else
         target_index = @index_name
       end
@@ -62,6 +63,6 @@ class Fluent::ElasticsearchOutput < Fluent::BufferedOutput
     http = Net::HTTP.new(@host, @port.to_i)
     request = Net::HTTP::Post.new("/_bulk")
     request.body = bulk_message.join("\n")
-    http.request(request)
+    http.request(request).value
   end
 end

data/test/plugin/test_out_elasticsearch.rb

@@ -35,6 +35,10 @@ class ElasticsearchOutput < Test::Unit::TestCase
     end
   end
 
+  def stub_elastic_unavailable(url="http://localhost:9200/_bulk")
+    stub_request(:post, url).to_return(:status => [503, "Service Unavailable"])
+  end
+
   def test_writes_to_default_index
     stub_elastic
     driver.emit(sample_record)
@@ -108,6 +112,17 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_equal(logstash_index, index_cmds.first['index']['_index'])
   end
 
+  def test_writes_to_logstash_index_with_specified_prefix
+    driver.configure("logstash_format true\n")
+    driver.configure("logstash_prefix myprefix\n")
+    time = Time.parse Date.today.to_s
+    logstash_index = "myprefix-#{time.getutc.strftime("%Y.%m.%d")}"
+    stub_elastic
+    driver.emit(sample_record, time)
+    driver.run
+    assert_equal(logstash_index, index_cmds.first['index']['_index'])
+  end
+
   def test_doesnt_add_logstash_timestamp_by_default
     stub_elastic
     driver.emit(sample_record)
@@ -163,4 +178,12 @@ class ElasticsearchOutput < Test::Unit::TestCase
     driver.run
     assert(!index_cmds[0]['index'].has_key?('_id'))
   end
+
+  def test_request_error
+    stub_elastic_unavailable
+    driver.emit(sample_record)
+    assert_raise(Net::HTTPFatalError) {
+      driver.run
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -89,18 +89,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3762640390142768539
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3762640390142768539
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -110,3 +104,4 @@ summary: ElasticSearch output plugin for Fluent event collector
 test_files:
 - test/helper.rb
 - test/plugin/test_out_elasticsearch.rb
+has_rdoc: