fluent-plugin-elasticsearch 2.11.1 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13413388e6afd8f9a4676e70d15952f5f2305876aac4499814f79b11b8613679
-  data.tar.gz: bb54ccf3fd39f494e62f1425fbb54558e4a6c3fe116fe5995c8905dd0b9de52a
+  metadata.gz: 6a4e029357f6bb2c914d2754eb9752a88d774e9eb326cb10f52a6d56d3e3ce09
+  data.tar.gz: b756fbd56d5c830df97f32b97d3f9f9f8593253c59a9861a7d3f8c2ae9d47220
 SHA512:
-  metadata.gz: 89b96d887e5a342c3d28db5109eb14b7a0b46179110ff9359166c4526377b7cfd507d7dfb9af4210697562ce8800d764f48f8c760f4e5719a08f4cc2857b99c3
-  data.tar.gz: 8d0d6b4dc17edac48dc986f119fca2dd27d3df89ed44f44fb8e155af679d8be8a563d8ae150aa05c0383607852eae15ac8b32e2ec071a8ab56a027c670da6ec6
+  metadata.gz: 6fa642ed492678b604eb7e8ff5a51e3f03cbe27929d64608432ee538ab98c3f6ca42f5dca63c6434d3290c977f3740445dbb9c3742d7d85faf43603432a491a1
+  data.tar.gz: 843ad9a1fcc3174871e1762a1843839ef9291bb2e862fee331f0b5f8b79f770273295d3c5fef0b0897708b325345110e19afe8a346dd99126c8ba7f0d2cfd98e

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 2.11.2
+- Strictness scheme (#445)
+
 ### 2.11.0
 - Uplift Merge pull request #437 from jcantrill/fix_bulk_count (#438)
 

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       = '2.11.1'
+  s.version       = '2.11.2'
   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

@@ -48,7 +48,7 @@ module Fluent::Plugin
     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,
@@ -196,8 +196,10 @@ EOC
       if @last_seen_major_version >= 6
         case @ssl_version
         when :SSLv23, :TLSv1, :TLSv1_1
-          log.warn "Detected ES 6.x or above and enabled insecure security:
-                    You might have to specify `ssl_version TLSv1_2` in configuration."
+          if @scheme == :https
+            log.warn "Detected ES 6.x or above and enabled insecure security:
+                      You might have to specify `ssl_version TLSv1_2` in configuration."
+          end
         end
       end
     end
@@ -306,7 +308,7 @@ EOC
             {
               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
@@ -318,7 +320,7 @@ EOC
           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

@@ -84,7 +84,7 @@ module Fluent::Plugin
             {
               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
@@ -96,7 +96,7 @@ module Fluent::Plugin
           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

@@ -196,7 +196,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
@@ -247,6 +247,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     config = %{
       ssl_version TLSv1_1
       @log_level warn
+      scheme https
     }
     instance = driver(config, 6).instance
     logs = driver.logs
@@ -257,6 +258,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     config = %{
       ssl_version TLSv1_2
       @log_level warn
+      scheme https
     }
     instance = driver(config, 7).instance
     logs = driver.logs

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -88,6 +88,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: 2.11.1
+  version: 2.11.2
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd