fluent-plugin-elasticsearch 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18bf8262f87eae27a0ff3e7d5efc101984ae112e0b0b1f9fcc8c286b60f760ea
-  data.tar.gz: d7964fb843241c67fa1920de545bc2c0759f4d6b7f45fbd3c2b3f8f66d7a7797
+  metadata.gz: b520bf633ecbf621fb94e7f4bfa83fa1922d678a577ab343b5b4936d602ceb4e
+  data.tar.gz: 9b05cb7ea5baffe76509387d61cb50c6ac1dffc097e273148ffae9b719f7cdf5
 SHA512:
-  metadata.gz: ffbd3297314e2f3a9ebecaa0009ac17f13d17fc97b057ac94e462b706e667f86cc21f3290e14f744ae7e71c905583cddd54303923a88e66510bbfa6ef70f3245
-  data.tar.gz: e814f94fb1110a3598136dc17ae846d80ff7e85c308a3f554d93c197dec94db4033a708502cce8c8c3257c34726ed509098f89f0f3fac96d4bb8aa2ff4cde524
+  metadata.gz: 3cf3aca2d2ed49e9807c17a7c740a001eb627575406f9336c69bdab6fe8a2f6156873a2488fda9947abc1c16332700497bcd2ebfe32eda53352acbdc1feb3b5e
+  data.tar.gz: b243859f0956ef22a561d1755a3a73700fb1cc82a18b857aa0248d068e72e40afd3ca78eeb3356fc898ccc6d5271504073cedae7aaa73a0b478eb4c89bb1a4f3

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 1.17.1
+- backport strictness-scheme (#447)
+
 ### 1.17.0
 - Fix #434 bulk count (#437)
 

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       = '1.17.0'
+  s.version       = '1.17.1'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -39,7 +39,7 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
   config_param :user, :string, :default => nil
   config_param :password, :string, :default => nil, :secret => true
   config_param :path, :string, :default => nil
-  config_param :scheme, :string, :default => 'http'
+  config_param :scheme, :enum, :list => [:https, :http], :default => :http
   config_param :hosts, :string, :default => nil
   config_param :target_index_key, :string, :default => nil
   config_param :target_type_key, :string, :default => nil
@@ -241,7 +241,7 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
           {
             host:   host_str.split(':')[0],
             port:   (host_str.split(':')[1] || @port).to_i,
-            scheme: @scheme
+            scheme: @scheme.to_s
           }
         else
           # New hosts format expects URLs such as http://logs.foo.com,https://john:pass@logs2.foo.com/elastic
@@ -253,7 +253,7 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
         end
       end.compact
     else
-      [{host: @host, port: @port, scheme: @scheme}]
+      [{host: @host, port: @port, scheme: @scheme.to_s}]
     end.each do |host|
       host.merge!(user: @user, password: @password) if !host[:user] && @user
       host.merge!(path: @path) if !host[:path] && @path

data/lib/fluent/plugin/out_elasticsearch_dynamic.rb

@@ -81,7 +81,7 @@ class Fluent::ElasticsearchOutputDynamic < Fluent::ElasticsearchOutput
           {
             host:   host_str.split(':')[0],
             port:   (host_str.split(':')[1] || @port).to_i,
-            scheme: @scheme
+            scheme: @scheme.to_s
           }
         else
           # New hosts format expects URLs such as http://logs.foo.com,https://john:pass@logs2.foo.com/elastic
@@ -93,7 +93,7 @@ class Fluent::ElasticsearchOutputDynamic < Fluent::ElasticsearchOutput
         end
       end.compact
     else
-      [{host: @host, port: @port.to_i, scheme: @scheme}]
+      [{host: @host, port: @port.to_i, scheme: @scheme.to_s}]
     end.each do |host|
       host.merge!(user: @user, password: @password) if !host[:user] && @user
       host.merge!(path: @path) if !host[:path] && @path

data/test/plugin/test_out_elasticsearch.rb

@@ -176,7 +176,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
 
     assert_equal 'logs.google.com', instance.host
     assert_equal 777, instance.port
-    assert_equal 'https', instance.scheme
+    assert_equal :https, instance.scheme
     assert_equal '/es/', instance.path
     assert_equal 'john', instance.user
     assert_equal 'doe', instance.password

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -68,6 +68,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     conf = instance.dynamic_config
     assert_equal 'logs.google.com', conf['host']
     assert_equal "777", conf['port']
+    assert_equal :https, instance.scheme
     assert_equal 'john', instance.user
     assert_equal 'doe', instance.password
     assert_equal '/es/', instance.path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd