fluentd 1.11.1-x64-mingw32 → 1.11.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de31e05af11ea6a1c1c8a438c174992bbd2f68119a4a0f912238448b591f9dc4
-  data.tar.gz: f446b2552386447d237c83c0512ec11914761fda1b959c7ef695deff150d2969
+  metadata.gz: 783193e143e478f7d0688b10b7f295c4d84a25814caceb52f0b683da3519b965
+  data.tar.gz: 809c4084ce6e1323e708561d0b64d30dd3ac7baf20bfe6becece0759b59c43e7
 SHA512:
-  metadata.gz: 5ed9f43e5efaabde10dfa2ef3f85d7ca3ffc05f0fd2019c5a63105587728f779739d2a9f7724d6a0fbb4997fd9dbcaf08bb48d1e2b73e1a03b99fafa2a389b1c
-  data.tar.gz: '09ff256fcc45b357443ee47e1a590b569ae4a11cd3c0c2b05a48f3288498822b1124eb3e4b0168023e8ffb6796a4292e641d6011daef62f115965cff046d2290'
+  metadata.gz: aad9889623e4976c9c84892d8290d15ab626c7ab1d1ea5977fe9752704c7bc6c462e8bd0e8e0dd79562a5bad9bc43f0a8fd7b1f633615d1da64de9285e08e38a
+  data.tar.gz: 1f3930325ae5fc28a632e271d1d240bb2d14a333dd0d441d3217e22e278ab968a005ccd463e106f17fb82a8ecb1f8e58842774d48c25c978840f013a46193a3a

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # v1.11
 
+## Release v1.11.2 - 2020/08/04
+
+### Enhancement
+
+* `in_dummy` renamed to `in_sample`
+  https://github.com/fluent/fluentd/pull/3065
+* Allow regular expression in filter/match directive
+  https://github.com/fluent/fluentd/pull/3071
+* Refactoring code
+  https://github.com/fluent/fluentd/pull/3051
+
+### Bug fix
+
+* buffer: Fix log message for `chunk_limit_records` case
+  https://github.com/fluent/fluentd/pull/3079
+* buffer: Fix timekey optimization for non-windows platform
+  https://github.com/fluent/fluentd/pull/3092
+* cert: Raise an error for broken certificate file
+  https://github.com/fluent/fluentd/pull/3086
+* cert: Set TLS ciphers list correcty on older OpenSSL
+  https://github.com/fluent/fluentd/pull/3093
+
 ## Release v1.11.1 - 2020/06/22
 
 ### Enhancement

data/example/copy_roundrobin.conf

@@ -1,12 +1,12 @@
 <source>
-  @type  dummy
+  @type  sample
   @label @test
   tag    test.copy
   auto_increment_key id
 </source>
 
 <source>
-  @type dummy
+  @type sample
   @label @test
   tag    test.rr
   auto_increment_key id
@@ -36,4 +36,4 @@
       output_type ltsv
     </store>
   </match>
-</label>
+</label>

data/example/counter.conf

@@ -8,7 +8,7 @@
 </system>
 
 <source>
-  @type dummy
+  @type sample
   tag "test.data"
   auto_increment_key number
 </source>

data/example/filter_stdout.conf

@@ -1,6 +1,6 @@
 <source>
-  @type dummy
-  tag dummy
+  @type sample
+  tag sample
 </source>
 
 <filter **>

data/example/{in_dummy_blocks.conf → in_sample_blocks.conf}

@@ -1,11 +1,11 @@
 <source>
-  @type dummy
-  tag dummy
+  @type sample
+  tag sample
   rate 100
-  dummy {"message":"yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay"}
+  sample {"message":"yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay"}
 </source>
 
-<match dummy>
+<match sample>
   @type null
   never_flush true
   <buffer>

data/example/{in_dummy_with_compression.conf → in_sample_with_compression.conf}

@@ -1,16 +1,16 @@
 <source>
-  @type dummy
+  @type sample
   @label @main
   tag "test.data"
   size 2
   rate 10
-  dummy {"message":"yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay"}
+  sample {"message":"yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay"}
   auto_increment_key number
 </source>
 
 <label @main>
   <match test.data>
-    @type buffered_stdout
+    @type stdout
     <buffer>
       @type file
       path "#{Dir.pwd}/compressed_buffers"

data/example/logevents.conf

@@ -1,10 +1,10 @@
 <source>
-  @type dummy
-  @label @dummylog
+  @type sample
+  @label @samplelog
   tag "data"
-  dummy {"message":"yay"}
+  sample {"message":"yay"}
 </source>
-<label @dummylog>
+<label @samplelog>
   <match **>
     @type stdout
   </match>
@@ -22,4 +22,4 @@
   #     hostname_key "host"
   #   </inject>
   # </match>
-</label> 
+</label>

data/example/multi_filters.conf

@@ -1,7 +1,7 @@
 # This example is to measure optimized filter pipeline performance.
 
 <source>
-  @type dummy
+  @type sample
   tag   test
   size 1000
 </source>

data/example/out_exec_filter.conf

@@ -1,10 +1,10 @@
 <source>
-  @type dummy
+  @type sample
   @label @exec
   tag exec_input
   rate 10
   auto_increment_key num
-  dummy {"data":"mydata"}
+  sample {"data":"mydata"}
 </source>
 
 <label @exec>

data/example/out_forward.conf

@@ -1,5 +1,5 @@
 <source>
-  @type dummy
+  @type sample
   tag test
 </source>
 

data/example/out_forward_buf_file.conf

@@ -1,5 +1,5 @@
 <source>
-    @type dummy
+    @type sample
     tag test
 </source>
 

data/example/out_forward_client.conf

@@ -1,21 +1,21 @@
 <source>
-  @type dummy
+  @type sample
   tag test
 </source>
 <source>
-  @type dummy
+  @type sample
   tag test2
 </source>
 <source>
-  @type dummy
+  @type sample
   tag test3
 </source>
 <source>
-  @type dummy
+  @type sample
   tag test4
 </source>
 <source>
-  @type dummy
+  @type sample
   tag test5
 </source>
 

data/example/out_forward_heartbeat_none.conf

@@ -1,5 +1,5 @@
 <source>
-  @type dummy
+  @type sample
   tag test
 </source>
 

data/example/out_forward_sd.conf

@@ -1,5 +1,5 @@
 <source>
-  @type dummy
+  @type sample
   tag test
 </source>
 

data/example/out_forward_shared_key.conf

@@ -1,9 +1,9 @@
 <source>
-  @type dummy
+  @type sample
   tag test
 </source>
 <source>
-  @type dummy
+  @type sample
   tag test2
 </source>
 

data/example/out_forward_tls.conf

@@ -1,5 +1,5 @@
 <source>
-  @type dummy
+  @type sample
   tag test
 </source>
 

data/example/out_forward_users.conf

@@ -1,13 +1,13 @@
 <source>
-  @type dummy
+  @type sample
   tag test
 </source>
 <source>
-  @type dummy
+  @type sample
   tag test2
 </source>
 <source>
-  @type dummy
+  @type sample
   tag test3
 </source>
 

data/example/out_null.conf

@@ -2,17 +2,17 @@
 # bundle exec bin/fluentd -c example/out_buffered_null.conf
 #   (+ --emit-error-log-interval 10)
 <source>
-  @type dummy
-  tag dummy
+  @type sample
+  tag sample
   rate 500000000
-  dummy [
+  sample [
     {"message": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
     {"message": "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"},
     {"message": "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"}
   ]
 </source>
 
-<match dummy.**>
+<match sample.**>
   @type null
   <buffer>
     flush_interval 60s

data/example/secondary_file.conf

@@ -3,7 +3,7 @@
 </system>
 
 <source>
-  @type dummy
+  @type sample
   tag test
 </source>
 

data/lib/fluent/match.rb

@@ -33,6 +33,15 @@ module Fluent
 
   class GlobMatchPattern < MatchPattern
     def initialize(pat)
+      if pat.start_with?('/')
+        if pat.end_with?('/')
+          @regex = Regexp.new("\\A"+pat[1..-2]+"\\Z")
+          return
+        else
+          raise Fluent::ConfigError,  "invalid match - regex"
+        end
+      end
+
       stack = []
       regex = ['']
       escape = false

data/lib/fluent/plugin/buffer.rb

@@ -143,17 +143,33 @@ module Fluent
           end
         end
 
+        # timekey should be unixtime as usual.
+        # So, unixtime should be bigger than 2^30 - 1 (= 1073741823) nowadays.
+        # We should check object_id stability to use object_id as optimization for comparing operations.
+        # e.g.)
+        # irb> Time.parse("2020/07/31 18:30:00+09:00").to_i
+        # => 1596187800
+        # irb> Time.parse("2020/07/31 18:30:00+09:00").to_i > 2**30 -1
+        # => true
+        def self.enable_optimize?
+          a1 = 2**30 - 1
+          a2 = 2**30 - 1
+          b1 = 2**62 - 1
+          b2 = 2**62 - 1
+          (a1.object_id == a2.object_id) && (b1.object_id == b2.object_id)
+        end
+
         # This is an optimization code. Current Struct's implementation is comparing all data.
         # https://github.com/ruby/ruby/blob/0623e2b7cc621b1733a760b72af246b06c30cf96/struct.c#L1200-L1203
         # Actually this overhead is very small but this class is generated *per chunk* (and used in hash object).
         # This means that this class is one of the most called object in Fluentd.
         # See https://github.com/fluent/fluentd/pull/2560
-        # But, this optimization has a side effect on Windows due to differing object_id.
+        # But, this optimization has a side effect on Windows and 32bit environment(s) due to differing object_id.
         # This difference causes flood of buffer files.
-        # So, this optimization should be enabled on non-Windows platform.
+        # So, this optimization should be enabled on `enable_optimize?` as true platforms.
         def hash
           timekey.object_id
-        end unless Fluent.windows?
+        end if enable_optimize?
       end
 
       # for tests
@@ -604,7 +620,11 @@ module Fluent
 
             if chunk_size_over?(chunk)
               if format && empty_chunk
-                log.warn "chunk bytes limit exceeds for an emitted event stream: #{adding_bytesize}bytes"
+                if chunk.bytesize > @chunk_limit_size
+                  log.warn "chunk bytes limit exceeds for an emitted event stream: #{adding_bytesize}bytes"
+                else
+                  log.warn "chunk size limit exceeds for an emitted event stream: #{chunk.size}records"
+                end
               end
               chunk.rollback
 

data/lib/fluent/plugin/in_dummy.rb

@@ -14,126 +14,5 @@
 #    limitations under the License.
 #
 
-require 'json'
-
-require 'fluent/plugin/input'
-require 'fluent/config/error'
-
-module Fluent::Plugin
-  class DummyInput < Input
-    Fluent::Plugin.register_input('dummy', self)
-
-    helpers :thread, :storage
-
-    BIN_NUM = 10
-    DEFAULT_STORAGE_TYPE = 'local'
-
-    desc "The value is the tag assigned to the generated events."
-    config_param :tag, :string
-    desc "The number of events in event stream of each emits."
-    config_param :size, :integer, default: 1
-    desc "It configures how many events to generate per second."
-    config_param :rate, :integer, default: 1
-    desc "If specified, each generated event has an auto-incremented key field."
-    config_param :auto_increment_key, :string, default: nil
-    desc "The boolean to suspend-and-resume incremental value after restart"
-    config_param :suspend, :bool, default: false,deprecated: 'This parameters is ignored'
-    desc "The dummy data to be generated. An array of JSON hashes or a single JSON hash."
-    config_param :dummy, default: [{"message"=>"dummy"}] do |val|
-      begin
-        parsed = JSON.parse(val)
-      rescue JSON::ParserError => ex
-        # Fluent::ConfigParseError, "got incomplete JSON" will be raised
-        # at literal_parser.rb with --use-v1-config, but I had to
-        # take care at here for the case of --use-v0-config.
-        raise Fluent::ConfigError, "#{ex.class}: #{ex.message}"
-      end
-      dummy = parsed.is_a?(Array) ? parsed : [parsed]
-      dummy.each_with_index do |e, i|
-        raise Fluent::ConfigError, "#{i}th element of dummy, #{e}, is not a hash" unless e.is_a?(Hash)
-      end
-      dummy
-    end
-
-    def initialize
-      super
-      @storage = nil
-    end
-
-    def configure(conf)
-      super
-      @dummy_index = 0
-      config = conf.elements.select{|e| e.name == 'storage' }.first
-      @storage = storage_create(usage: 'suspend', conf: config, default_type: DEFAULT_STORAGE_TYPE)
-    end
-
-    def multi_workers_ready?
-      true
-    end
-
-    def start
-      super
-
-      @storage.put(:increment_value, 0) unless @storage.get(:increment_value)
-      @storage.put(:dummy_index, 0) unless @storage.get(:dummy_index)
-
-      if @auto_increment_key && !@storage.get(:auto_increment_value)
-        @storage.put(:auto_increment_value, -1)
-      end
-
-      thread_create(:dummy_input, &method(:run))
-    end
-
-    def run
-      batch_num    = (@rate / BIN_NUM).to_i
-      residual_num = (@rate % BIN_NUM)
-      while thread_current_running?
-        current_time = Time.now.to_i
-        BIN_NUM.times do
-          break unless (thread_current_running? && Time.now.to_i <= current_time)
-          wait(0.1) { emit(batch_num) }
-        end
-        emit(residual_num) if thread_current_running?
-        # wait for next second
-        while thread_current_running? && Time.now.to_i <= current_time
-          sleep 0.01
-        end
-      end
-    end
-
-    def emit(num)
-      begin
-        if @size > 1
-          num.times do
-            router.emit_array(@tag, Array.new(@size) { [Fluent::EventTime.now, generate] })
-          end
-        else
-          num.times { router.emit(@tag, Fluent::EventTime.now, generate) }
-        end
-      rescue => _
-        # ignore all errors not to stop emits by emit errors
-      end
-    end
-
-    def generate
-      d = @dummy[@dummy_index]
-      unless d
-        @dummy_index = 0
-        d = @dummy[@dummy_index]
-      end
-      @dummy_index += 1
-      if @auto_increment_key
-        d = d.dup
-        d[@auto_increment_key] = @storage.update(:auto_increment_value){|v| v + 1 }
-      end
-      d
-    end
-
-    def wait(time)
-      start_time = Time.now
-      yield
-      sleep_time = time - (Time.now - start_time)
-      sleep sleep_time if sleep_time > 0
-    end
-  end
-end
+# Remove this file in fluentd v2
+require_relative 'in_sample'

data/lib/fluent/plugin/in_http.rb

@@ -72,7 +72,7 @@ module Fluent::Plugin
     desc 'Add REMOTE_ADDR header to the record.'
     config_param :add_remote_addr, :bool, default: false
     config_param :blocking_timeout, :time, default: 0.5
-    desc 'Set a white list of domains that can do CORS (Cross-Origin Resource Sharing)'
+    desc 'Set a allow list of domains that can do CORS (Cross-Origin Resource Sharing)'
     config_param :cors_allow_origins, :array, default: nil
     desc 'Respond with empty gif image of 1x1 pixel.'
     config_param :respond_with_empty_img, :bool, default: false
@@ -490,7 +490,7 @@ module Fluent::Plugin
         # CORS check
         # ==========
         # For every incoming request, we check if we have some CORS
-        # restrictions and white listed origins through @cors_allow_origins.
+        # restrictions and allow listed origins through @cors_allow_origins.
         unless @cors_allow_origins.nil?
           unless @cors_allow_origins.include?('*') or include_cors_allow_origin
             send_response_and_close(RES_403_STATUS, {'Connection' => 'close'}, "")

data/lib/fluent/plugin/in_sample.rb

@@ -0,0 +1,141 @@
+#
+# Fluentd
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+require 'json'
+
+require 'fluent/plugin/input'
+require 'fluent/config/error'
+
+module Fluent::Plugin
+  class SampleInput < Input
+    Fluent::Plugin.register_input('sample', self)
+    Fluent::Plugin.register_input('dummy', self)
+
+    helpers :thread, :storage
+
+    BIN_NUM = 10
+    DEFAULT_STORAGE_TYPE = 'local'
+
+    desc "The value is the tag assigned to the generated events."
+    config_param :tag, :string
+    desc "The number of events in event stream of each emits."
+    config_param :size, :integer, default: 1
+    desc "It configures how many events to generate per second."
+    config_param :rate, :integer, default: 1
+    desc "If specified, each generated event has an auto-incremented key field."
+    config_param :auto_increment_key, :string, default: nil
+    desc "The boolean to suspend-and-resume incremental value after restart"
+    config_param :suspend, :bool, default: false,deprecated: 'This parameters is ignored'
+    desc "The sample data to be generated. An array of JSON hashes or a single JSON hash."
+    config_param :sample, alias: :dummy, default: [{"message" => "sample"}] do |val|
+      begin
+        parsed = JSON.parse(val)
+      rescue JSON::ParserError => ex
+        # Fluent::ConfigParseError, "got incomplete JSON" will be raised
+        # at literal_parser.rb with --use-v1-config, but I had to
+        # take care at here for the case of --use-v0-config.
+        raise Fluent::ConfigError, "#{ex.class}: #{ex.message}"
+      end
+      sample = parsed.is_a?(Array) ? parsed : [parsed]
+      sample.each_with_index do |e, i|
+        raise Fluent::ConfigError, "#{i}th element of sample, #{e}, is not a hash" unless e.is_a?(Hash)
+      end
+      sample
+    end
+
+    def initialize
+      super
+      @storage = nil
+    end
+
+    def configure(conf)
+      super
+      @sample_index = 0
+      config = conf.elements.select{|e| e.name == 'storage' }.first
+      @storage = storage_create(usage: 'suspend', conf: config, default_type: DEFAULT_STORAGE_TYPE)
+    end
+
+    def multi_workers_ready?
+      true
+    end
+
+    def start
+      super
+
+      @storage.put(:increment_value, 0) unless @storage.get(:increment_value)
+      # keep 'dummy' to avoid breaking changes for existing environment. Change it in fluentd v2
+      @storage.put(:dummy_index, 0) unless @storage.get(:dummy_index)
+
+      if @auto_increment_key && !@storage.get(:auto_increment_value)
+        @storage.put(:auto_increment_value, -1)
+      end
+
+      thread_create(:sample_input, &method(:run))
+    end
+
+    def run
+      batch_num    = (@rate / BIN_NUM).to_i
+      residual_num = (@rate % BIN_NUM)
+      while thread_current_running?
+        current_time = Time.now.to_i
+        BIN_NUM.times do
+          break unless (thread_current_running? && Time.now.to_i <= current_time)
+          wait(0.1) { emit(batch_num) }
+        end
+        emit(residual_num) if thread_current_running?
+        # wait for next second
+        while thread_current_running? && Time.now.to_i <= current_time
+          sleep 0.01
+        end
+      end
+    end
+
+    def emit(num)
+      begin
+        if @size > 1
+          num.times do
+            router.emit_array(@tag, Array.new(@size) { [Fluent::EventTime.now, generate] })
+          end
+        else
+          num.times { router.emit(@tag, Fluent::EventTime.now, generate) }
+        end
+      rescue => _
+        # ignore all errors not to stop emits by emit errors
+      end
+    end
+
+    def generate
+      d = @sample[@sample_index]
+      unless d
+        @sample_index = 0
+        d = @sample[@sample_index]
+      end
+      @sample_index += 1
+      if @auto_increment_key
+        d = d.dup
+        d[@auto_increment_key] = @storage.update(:auto_increment_value){|v| v + 1 }
+      end
+      d
+    end
+
+    def wait(time)
+      start_time = Time.now
+      yield
+      sleep_time = time - (Time.now - start_time)
+      sleep sleep_time if sleep_time > 0
+    end
+  end
+end

data/lib/fluent/plugin_helper/cert_option.rb

@@ -27,13 +27,9 @@ module Fluent
         cert, key, extra = cert_option_server_validate!(conf)
 
         ctx = OpenSSL::SSL::SSLContext.new
-        unless insecure
-          # inject OpenSSL::SSL::SSLContext::DEFAULT_PARAMS
-          # https://bugs.ruby-lang.org/issues/9424
-          ctx.set_params({})
-
-          ctx.ciphers = ciphers
-        end
+        # inject OpenSSL::SSL::SSLContext::DEFAULT_PARAMS
+        # https://bugs.ruby-lang.org/issues/9424
+        ctx.set_params({}) unless insecure
 
         if conf.client_cert_auth
           ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
@@ -56,6 +52,7 @@ module Fluent
         end
 
         Fluent::TLS.set_version_to_context(ctx, version, conf.min_version, conf.max_version)
+        ctx.ciphers = ciphers unless insecure
 
         ctx
       end
@@ -185,7 +182,7 @@ module Fluent
         list = []
         data.scan(pattern){|match| list << OpenSSL::X509::Certificate.new(match) }
         if list.length == 0
-          log.warn "cert_path does not contain a valid certificate"
+          raise Fluent::ConfigError, "cert_path does not contain a valid certificate"
         end
         list
       end

data/lib/fluent/plugin_helper/socket.rb

@@ -199,7 +199,7 @@ module Fluent
         list = []
         data.scan(pattern) { |match| list << OpenSSL::X509::Certificate.new(match) }
         if list.length == 0
-          log.warn "cert_path does not contain a valid certificate"
+          raise Fluent::ConfigError, "cert_path does not contain a valid certificate"
         end
         list
       end

data/lib/fluent/supervisor.rb

@@ -804,7 +804,7 @@ module Fluent
             Fluent::Engine.reload_config(conf)
           end
         rescue => e
-          # it is guranteed that config file is valid by supervisor side. but it's not atomic becuase of using signals to commnicate between worker and super
+          # it is guaranteed that config file is valid by supervisor side. but it's not atomic because of using signals to commnicate between worker and super
           # So need this rescue code
           $log.error("failed to reload config: #{e}")
           next

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.11.1'
+  VERSION = '1.11.2'
 
 end

data/test/plugin/{test_in_dummy.rb → test_in_sample.rb}

@@ -1,33 +1,33 @@
 require_relative '../helper'
 require 'fluent/test/driver/input'
-require 'fluent/plugin/in_dummy'
+require 'fluent/plugin/in_sample'
 require 'fileutils'
 
-class DummyTest < Test::Unit::TestCase
+class SampleTest < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
   end
 
   def create_driver(conf)
-    Fluent::Test::Driver::Input.new(Fluent::Plugin::DummyInput).configure(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::SampleInput).configure(conf)
   end
 
   sub_test_case 'configure' do
     test 'required parameters' do
       assert_raise_message("'tag' parameter is required") do
-        Fluent::Plugin::DummyInput.new.configure(config_element('ROOT',''))
+        Fluent::Plugin::SampleInput.new.configure(config_element('ROOT',''))
       end
     end
 
     test 'tag' do
       d = create_driver(%[
-        tag dummy
+        tag sample
       ])
-      assert_equal "dummy", d.instance.tag
+      assert_equal "sample", d.instance.tag
     end
 
     config = %[
-      tag dummy
+      tag sample
     ]
 
     test 'auto_increment_key' do
@@ -44,30 +44,30 @@ class DummyTest < Test::Unit::TestCase
       assert_equal 10, d.instance.rate
     end
 
-    test 'dummy' do
+    test 'sample' do
       # hash is okay
-      d = create_driver(config + %[dummy {"foo":"bar"}])
-      assert_equal [{"foo"=>"bar"}], d.instance.dummy
+      d = create_driver(config + %[sample {"foo":"bar"}])
+      assert_equal [{"foo"=>"bar"}], d.instance.sample
 
       # array of hash is okay
-      d = create_driver(config + %[dummy [{"foo":"bar"}]])
-      assert_equal [{"foo"=>"bar"}], d.instance.dummy
+      d = create_driver(config + %[sample [{"foo":"bar"}]])
+      assert_equal [{"foo"=>"bar"}], d.instance.sample
 
       assert_raise_message(/JSON::ParserError|got incomplete JSON/) do
-        create_driver(config + %[dummy "foo"])
+        create_driver(config + %[sample "foo"])
       end
 
       assert_raise_message(/is not a hash/) do
-        create_driver(config + %[dummy ["foo"]])
+        create_driver(config + %[sample ["foo"]])
       end
     end
   end
 
   sub_test_case "emit" do
     config = %[
-      tag dummy
+      tag sample
       rate 10
-      dummy {"foo":"bar"}
+      sample {"foo":"bar"}
     ]
 
     test 'simple' do
@@ -75,7 +75,7 @@ class DummyTest < Test::Unit::TestCase
       d.run(timeout: 0.5)
 
       d.events.each do |tag, time, record|
-        assert_equal("dummy", tag)
+        assert_equal("sample", tag)
         assert_equal({"foo"=>"bar"}, record)
         assert(time.is_a?(Fluent::EventTime))
       end
@@ -86,20 +86,20 @@ class DummyTest < Test::Unit::TestCase
       d.run(timeout: 0.5)
 
       d.events.each_with_index do |(tag, _time, record), i|
-        assert_equal("dummy", tag)
+        assert_equal("sample", tag)
         assert_equal({"foo"=>"bar", "id"=>i}, record)
       end
     end
   end
 
-  TEST_PLUGIN_STORAGE_PATH = File.join( File.dirname(File.dirname(__FILE__)), 'tmp', 'in_dummy', 'store' )
+  TEST_PLUGIN_STORAGE_PATH = File.join( File.dirname(File.dirname(__FILE__)), 'tmp', 'in_sample', 'store' )
   FileUtils.mkdir_p TEST_PLUGIN_STORAGE_PATH
 
-  sub_test_case 'when dummy plugin has storage which is not specified the path'  do
+  sub_test_case 'when sample plugin has storage which is not specified the path'  do
     config1 = {
-      'tag' => 'dummy',
+      'tag' => 'sample',
       'rate' => '0',
-      'dummy' => '[{"x": 1, "y": "1"}, {"x": 2, "y": "2"}, {"x": 3, "y": "3"}]',
+      'sample' => '[{"x": 1, "y": "1"}, {"x": 2, "y": "2"}, {"x": 3, "y": "3"}]',
       'auto_increment_key' => 'id',
     }
     conf1 = config_element('ROOT', '', config1, [])
@@ -135,7 +135,7 @@ class DummyTest < Test::Unit::TestCase
     end
   end
 
-  sub_test_case 'when dummy plugin has storage which is specified the path'  do
+  sub_test_case 'when sample plugin has storage which is specified the path'  do
     setup do
       FileUtils.rm_rf(TEST_PLUGIN_STORAGE_PATH)
       FileUtils.mkdir_p(File.join(TEST_PLUGIN_STORAGE_PATH, 'json'))
@@ -144,9 +144,9 @@ class DummyTest < Test::Unit::TestCase
 
     config2 = {
       '@id' => 'test-02',
-      'tag' => 'dummy',
+      'tag' => 'sample',
       'rate' => '0',
-      'dummy' => '[{"x": 1, "y": "1"}, {"x": 2, "y": "2"}, {"x": 3, "y": "3"}]',
+      'sample' => '[{"x": 1, "y": "1"}, {"x": 2, "y": "2"}, {"x": 3, "y": "3"}]',
       'auto_increment_key' => 'id',
     }
     conf2 = config_element('ROOT', '', config2, [

data/test/plugin_helper/test_cert_option.rb

@@ -15,4 +15,11 @@ class CertOptionPluginHelperTest < Test::Unit::TestCase
     certs = d.cert_option_certificates_from_file("test/plugin_helper/data/cert/cert-with-CRLF.pem")
     assert_equal(1, certs.length)
   end
+
+  test 'raise an error for broken certificates_from_file file' do
+    d = Dummy.new
+    assert_raise Fluent::ConfigError do
+      certs = d.cert_option_certificates_from_file("test/plugin_helper/data/cert/empty.pem")
+    end
+  end
 end

data/test/plugin_helper/test_server.rb

@@ -1233,6 +1233,40 @@ class ServerPluginHelperTest < Test::Unit::TestCase
         waiting(10){ sleep 0.1 until received.bytesize == 8 }
         assert_equal "yay\nfoo\n", received
       end
+
+      test 'set ciphers' do
+        cert_path = File.join(@server_cert_dir, "cert.pem")
+        private_key_path = File.join(@certs_dir, "server.key.pem")
+        create_server_pair_signed_by_self(cert_path, private_key_path, nil)
+        tls_options = {
+          protocol: :tls,
+          version: :TLSv1_2,
+          ciphers: 'SHA256',
+          insecure: false,
+          cert_path: cert_path,
+          private_key_path: private_key_path,
+        }
+        conf = @d.server_create_transport_section_object(tls_options)
+        ctx = @d.cert_option_create_context(conf.version, conf.insecure, conf.ciphers, conf)
+        matched = false
+        ctx.ciphers.each do |cipher|
+          cipher_name, tls_version = cipher
+          # OpenSSL 1.0.2: "TLSv1/SSLv3"
+          # OpenSSL 1.1.1: "TLSv1.2"
+          if tls_version == "TLSv1/SSLv3" || tls_version == "TLSv1.2"
+            matched = true
+            unless cipher_name.match(/#{conf.ciphers}/)
+              matched = false
+              break
+            end
+          end
+        end
+
+        error_msg = build_message("Unexpected ciphers for #{conf.version}",
+                                  "<?>\nwas expected to include only <?> ciphers for #{conf.version}",
+                                  ctx.ciphers, conf.ciphers)
+        assert(matched, error_msg)
+      end
     end
   end
 

data/test/plugin_helper/test_socket.rb

@@ -128,4 +128,12 @@ class SocketHelperTest < Test::Unit::TestCase
       client.close
     end
   end
+
+  test 'with empty cert file' do
+    cert_path = File.expand_path(File.dirname(__FILE__) + '/data/cert/empty.pem')
+
+    assert_raise Fluent::ConfigError do
+      SocketHelperTestPlugin.new.socket_create_tls('127.0.0.1', PORT, cert_path: cert_path)
+    end
+  end
 end

data/test/test_match.rb

@@ -101,6 +101,17 @@ class MatchTest < Test::Unit::TestCase
     assert_or_not_match('a.b.** a.c', 'a.c.d')
   end
 
+  def test_regex_pattern
+    assert_glob_match('/a/', 'a')
+    assert_glob_not_match('/a/', 'abc')
+    assert_glob_match('/a.*/', 'abc')
+    assert_glob_not_match('/b.*/', 'abc')
+    assert_glob_match('/a\..*/', 'a.b.c')
+    assert_glob_not_match('/(?!a\.).*/', 'a.b.c')
+    assert_glob_not_match('/a\..*/', 'b.b.c')
+    assert_glob_match('/(?!a\.).*/', 'b.b.c')
+  end
+
   #def test_character_class
   #  assert_match('[a]', 'a')
   #  assert_match('[ab]', 'a')

data/test/test_static_config_analysis.rb

@@ -6,7 +6,7 @@ require 'fluent/plugin/out_forward'
 require 'fluent/plugin/out_stdout'
 require 'fluent/plugin/out_exec'
 require 'fluent/plugin/in_forward'
-require 'fluent/plugin/in_dummy'
+require 'fluent/plugin/in_sample'
 require 'fluent/plugin/filter_grep'
 require 'fluent/plugin/filter_stdout'
 require 'fluent/plugin/filter_parser'
@@ -74,7 +74,7 @@ class StaticConfigAnalysisTest < ::Test::Unit::TestCase
       c = Fluent::Config.parse(conf_data, '(test)', '(test_dir)', true)
       ret = Fluent::StaticConfigAnalysis.call(c)
       assert_equal [Fluent::Plugin::ExecOutput, Fluent::Plugin::StdoutOutput, Fluent::Plugin::ForwardOutput], ret.outputs.map(&:plugin).map(&:class)
-      assert_equal [Fluent::Plugin::DummyInput, Fluent::Plugin::ForwardInput], ret.inputs.map(&:plugin).map(&:class)
+      assert_equal [Fluent::Plugin::SampleInput, Fluent::Plugin::ForwardInput], ret.inputs.map(&:plugin).map(&:class)
       assert_equal [Fluent::Plugin::ParserFilter, Fluent::Plugin::StdoutFilter, Fluent::Plugin::GrepFilter], ret.filters.map(&:plugin).map(&:class)
       assert_equal 1, ret.labels.size
       assert_equal '@test', ret.labels[0].name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -458,8 +458,6 @@ files:
 - example/copy_roundrobin.conf
 - example/counter.conf
 - example/filter_stdout.conf
-- example/in_dummy_blocks.conf
-- example/in_dummy_with_compression.conf
 - example/in_forward.conf
 - example/in_forward_client.conf
 - example/in_forward_shared_key.conf
@@ -468,6 +466,8 @@ files:
 - example/in_forward_workers.conf
 - example/in_http.conf
 - example/in_out_forward.conf
+- example/in_sample_blocks.conf
+- example/in_sample_with_compression.conf
 - example/in_syslog.conf
 - example/in_tail.conf
 - example/in_tcp.conf
@@ -605,6 +605,7 @@ files:
 - lib/fluent/plugin/in_http.rb
 - lib/fluent/plugin/in_monitor_agent.rb
 - lib/fluent/plugin/in_object_space.rb
+- lib/fluent/plugin/in_sample.rb
 - lib/fluent/plugin/in_syslog.rb
 - lib/fluent/plugin/in_tail.rb
 - lib/fluent/plugin/in_tail/position_file.rb
@@ -815,13 +816,13 @@ files:
 - test/plugin/test_formatter_single_value.rb
 - test/plugin/test_formatter_tsv.rb
 - test/plugin/test_in_debug_agent.rb
-- test/plugin/test_in_dummy.rb
 - test/plugin/test_in_exec.rb
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
 - test/plugin/test_in_http.rb
 - test/plugin/test_in_monitor_agent.rb
 - test/plugin/test_in_object_space.rb
+- test/plugin/test_in_sample.rb
 - test/plugin/test_in_syslog.rb
 - test/plugin/test_in_tail.rb
 - test/plugin/test_in_tcp.rb
@@ -877,6 +878,7 @@ files:
 - test/plugin_helper/data/cert/cert_chains/ca-cert.pem
 - test/plugin_helper/data/cert/cert_chains/cert-key.pem
 - test/plugin_helper/data/cert/cert_chains/cert.pem
+- test/plugin_helper/data/cert/empty.pem
 - test/plugin_helper/data/cert/generate_cert.rb
 - test/plugin_helper/data/cert/with_ca/ca-cert-key-pass.pem
 - test/plugin_helper/data/cert/with_ca/ca-cert-key.pem
@@ -1048,13 +1050,13 @@ test_files:
 - test/plugin/test_formatter_single_value.rb
 - test/plugin/test_formatter_tsv.rb
 - test/plugin/test_in_debug_agent.rb
-- test/plugin/test_in_dummy.rb
 - test/plugin/test_in_exec.rb
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
 - test/plugin/test_in_http.rb
 - test/plugin/test_in_monitor_agent.rb
 - test/plugin/test_in_object_space.rb
+- test/plugin/test_in_sample.rb
 - test/plugin/test_in_syslog.rb
 - test/plugin/test_in_tail.rb
 - test/plugin/test_in_tcp.rb
@@ -1110,6 +1112,7 @@ test_files:
 - test/plugin_helper/data/cert/cert_chains/ca-cert.pem
 - test/plugin_helper/data/cert/cert_chains/cert-key.pem
 - test/plugin_helper/data/cert/cert_chains/cert.pem
+- test/plugin_helper/data/cert/empty.pem
 - test/plugin_helper/data/cert/generate_cert.rb
 - test/plugin_helper/data/cert/with_ca/ca-cert-key-pass.pem
 - test/plugin_helper/data/cert/with_ca/ca-cert-key.pem