fluentd 0.14.2 → 0.14.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,20 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -56,36 +48,30 @@ dependencies:
   name: cool.io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -124,84 +110,84 @@ dependencies:
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: strptime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.3
 - !ruby/object:Gem::Dependency
@@ -210,70 +196,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -319,17 +305,25 @@ files:
 - example/copy_roundrobin.conf
 - example/filter_stdout.conf
 - example/in_forward.conf
+- example/in_forward_client.conf
+- example/in_forward_shared_key.conf
+- example/in_forward_users.conf
 - example/in_http.conf
 - example/in_out_forward.conf
 - example/in_syslog.conf
 - example/in_tail.conf
 - example/in_tcp.conf
 - example/in_udp.conf
-- example/out_buffered_null.conf
+- example/multi_filters.conf
 - example/out_copy.conf
 - example/out_file.conf
 - example/out_forward.conf
 - example/out_forward_buf_file.conf
+- example/out_forward_client.conf
+- example/out_forward_shared_key.conf
+- example/out_forward_users.conf
+- example/out_null.conf
+- example/secondary_file.conf
 - example/v0_12_filter.conf
 - example/v1_literal_example.conf
 - fluent.conf
@@ -429,8 +423,6 @@ files:
 - lib/fluent/plugin/in_unix.rb
 - lib/fluent/plugin/input.rb
 - lib/fluent/plugin/multi_output.rb
-- lib/fluent/plugin/out_buffered_null.rb
-- lib/fluent/plugin/out_buffered_stdout.rb
 - lib/fluent/plugin/out_copy.rb
 - lib/fluent/plugin/out_exec.rb
 - lib/fluent/plugin/out_exec_filter.rb
@@ -439,6 +431,7 @@ files:
 - lib/fluent/plugin/out_null.rb
 - lib/fluent/plugin/out_relabel.rb
 - lib/fluent/plugin/out_roundrobin.rb
+- lib/fluent/plugin/out_secondary_file.rb
 - lib/fluent/plugin/out_stdout.rb
 - lib/fluent/plugin/out_stream.rb
 - lib/fluent/plugin/output.rb
@@ -499,6 +492,7 @@ files:
 - lib/fluent/test/log.rb
 - lib/fluent/test/output_test.rb
 - lib/fluent/test/parser_test.rb
+- lib/fluent/test/startup_shutdown.rb
 - lib/fluent/time.rb
 - lib/fluent/timezone.rb
 - lib/fluent/unique_id.rb
@@ -548,6 +542,7 @@ files:
 - 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_syslog.rb
 - test/plugin/test_in_tail.rb
@@ -556,8 +551,6 @@ files:
 - test/plugin/test_in_unix.rb
 - test/plugin/test_input.rb
 - test/plugin/test_multi_output.rb
-- test/plugin/test_out_buffered_null.rb
-- test/plugin/test_out_buffered_stdout.rb
 - test/plugin/test_out_copy.rb
 - test/plugin/test_out_exec.rb
 - test/plugin/test_out_exec_filter.rb
@@ -566,6 +559,7 @@ files:
 - test/plugin/test_out_null.rb
 - test/plugin/test_out_relabel.rb
 - test/plugin/test_out_roundrobin.rb
+- test/plugin/test_out_secondary_file.rb
 - test/plugin/test_out_stdout.rb
 - test/plugin/test_out_stream.rb
 - test/plugin/test_output.rb
@@ -696,6 +690,7 @@ test_files:
 - 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_syslog.rb
 - test/plugin/test_in_tail.rb
@@ -704,8 +699,6 @@ test_files:
 - test/plugin/test_in_unix.rb
 - test/plugin/test_input.rb
 - test/plugin/test_multi_output.rb
-- test/plugin/test_out_buffered_null.rb
-- test/plugin/test_out_buffered_stdout.rb
 - test/plugin/test_out_copy.rb
 - test/plugin/test_out_exec.rb
 - test/plugin/test_out_exec_filter.rb
@@ -714,6 +707,7 @@ test_files:
 - test/plugin/test_out_null.rb
 - test/plugin/test_out_relabel.rb
 - test/plugin/test_out_roundrobin.rb
+- test/plugin/test_out_secondary_file.rb
 - test/plugin/test_out_stdout.rb
 - test/plugin/test_out_stream.rb
 - test/plugin/test_output.rb

data/lib/fluent/plugin/out_buffered_null.rb

@@ -1,59 +0,0 @@
-#
-# 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 'fluent/plugin/output'
-
-module Fluent::Plugin
-  class BufferedNullOutput < Output
-    # This plugin is for tests of buffer plugins
-
-    Fluent::Plugin.register_output('buffered_null', self)
-
-    config_section :buffer do
-      config_set_default :chunk_keys, ['tag']
-      config_set_default :flush_at_shutdown, true
-      config_set_default :chunk_limit_size, 10 * 1024
-    end
-
-    attr_accessor :feed_proc, :delayed
-
-    def initialize
-      super
-      @delayed = false
-      @feed_proc = nil
-    end
-
-    def prefer_delayed_commit
-      @delayed
-    end
-
-    def write(chunk)
-      if @feed_proc
-        @feed_proc.call(chunk)
-      else
-        # ignore chunk.read
-      end
-    end
-
-    def try_write(chunk)
-      if @feed_proc
-        @feed_proc.call(chunk)
-      else
-        # ignore chunk.read
-      end
-    end
-  end
-end

data/lib/fluent/plugin/out_buffered_stdout.rb

@@ -1,70 +0,0 @@
-#
-# 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 'fluent/plugin/output'
-
-module Fluent::Plugin
-  class BufferedStdoutOutput < Output
-    Fluent::Plugin.register_output('buffered_stdout', self)
-
-    helpers :formatter, :inject, :compat_parameters
-
-    config_section :buffer do
-      config_set_default :chunk_keys, ['tag']
-      config_set_default :flush_at_shutdown, true
-      config_set_default :chunk_limit_size, 10 * 1024
-    end
-
-    DEFAULT_FORMAT_TYPE = 'json'
-
-    config_section :format do
-      config_set_default :@type, DEFAULT_FORMAT_TYPE
-    end
-
-    attr_accessor :delayed
-
-    def initialize
-      super
-      @delayed = false
-    end
-
-    def prefer_delayed_commit
-      @delayed
-    end
-
-    def configure(conf)
-      if conf['output_type'] && !conf['format']
-        conf['format'] = conf['output_type']
-      end
-      compat_parameters_convert(conf, :inject, :formatter)
-      super
-      @formatter = formatter_create(conf: conf.elements('format').first, default_type: DEFAULT_FORMAT_TYPE)
-    end
-
-    def write(chunk)
-      chunk.write_to($log)
-    end
-
-    def try_write(chunk)
-      chunk.write_to($log)
-    end
-
-    def format(tag, time, record)
-      record = inject_values_to_record(tag, time, record)
-      "#{Time.at(time).localtime} #{tag}: #{@formatter.format(tag, time, record).chomp}\n"
-    end
-  end
-end

data/test/plugin/test_out_buffered_null.rb

@@ -1,79 +0,0 @@
-require_relative '../helper'
-require 'fluent/test/driver/output'
-require 'fluent/plugin/out_buffered_null'
-
-class BufferedNullOutputTestCase < Test::Unit::TestCase
-  sub_test_case 'BufferedNullOutput' do
-    test 'default chunk limit size is 100' do
-      d = Fluent::Test::Driver::Output.new(Fluent::Plugin::BufferedNullOutput).configure('')
-      assert_equal 10 * 1024, d.instance.buffer_config.chunk_limit_size
-      assert d.instance.buffer_config.flush_at_shutdown
-      assert_equal ['tag'], d.instance.buffer_config.chunk_keys
-      assert d.instance.chunk_key_tag
-      assert !d.instance.chunk_key_time
-      assert_equal [], d.instance.chunk_keys
-    end
-
-    test 'writes standard formattted chunks' do
-      d = Fluent::Test::Driver::Output.new(Fluent::Plugin::BufferedNullOutput).configure('')
-      t = event_time("2016-05-23 00:22:13 -0800")
-      d.run(default_tag: 'test', flush: true) do
-        d.feed(t, {"message" => "null null null"})
-        d.feed(t, {"message" => "null null"})
-        d.feed(t, {"message" => "null"})
-      end
-
-      assert_equal 3, d.instance.emit_count
-      assert_equal 3, d.instance.emit_records
-    end
-
-    test 'check for chunk passed to #write' do
-      d = Fluent::Test::Driver::Output.new(Fluent::Plugin::BufferedNullOutput).configure('')
-      data = []
-      d.instance.feed_proc = ->(chunk){ data << [chunk.unique_id, chunk.metadata.tag, chunk.read] }
-
-      t = event_time("2016-05-23 00:22:13 -0800")
-      d.run(default_tag: 'test', flush: true) do
-        d.feed(t, {"message" => "null null null"})
-        d.feed(t, {"message" => "null null"})
-        d.feed(t, {"message" => "null"})
-      end
-
-      assert_equal 1, data.size
-      _, tag, binary = data.first
-      events = []
-      Fluent::MessagePackFactory.unpacker.feed_each(binary){|obj| events << obj }
-      assert_equal 'test', tag
-      assert_equal [ [t, {"message" => "null null null"}], [t, {"message" => "null null"}], [t, {"message" => "null"}] ], events
-    end
-
-    test 'check for chunk passed to #try_write' do
-      d = Fluent::Test::Driver::Output.new(Fluent::Plugin::BufferedNullOutput).configure('')
-      data = []
-      d.instance.feed_proc = ->(chunk){ data << [chunk.unique_id, chunk.metadata.tag, chunk.read] }
-      d.instance.delayed = true
-
-      t = event_time("2016-05-23 00:22:13 -0800")
-      d.run(default_tag: 'test', flush: true, shutdown: false) do
-        d.feed(t, {"message" => "null null null"})
-        d.feed(t, {"message" => "null null"})
-        d.feed(t, {"message" => "null"})
-      end
-
-      assert_equal 1, data.size
-      chunk_id, tag, binary = data.first
-      events = []
-      Fluent::MessagePackFactory.unpacker.feed_each(binary){|obj| events << obj }
-      assert_equal 'test', tag
-      assert_equal [ [t, {"message" => "null null null"}], [t, {"message" => "null null"}], [t, {"message" => "null"}] ], events
-
-      assert_equal [chunk_id], d.instance.buffer.dequeued.keys
-
-      d.instance.commit_write(chunk_id)
-
-      assert_equal [], d.instance.buffer.dequeued.keys
-
-      d.instance_shutdown
-    end
-  end
-end