fluentd 0.14.9 → 0.14.10

data/test/plugin/test_in_forward.rb

@@ -59,13 +59,6 @@ class ForwardInputTest < Test::Unit::TestCase
   end
 
   sub_test_case '#configure' do
-    setup do
-      Fluent::Test::StartupShutdown.setup
-    end
-    teardown do
-      Fluent::Test::StartupShutdown.teardown
-    end
-
     test 'simple' do
       @d = d = create_driver
       assert_equal PORT, d.instance.port
@@ -88,18 +81,7 @@ class ForwardInputTest < Test::Unit::TestCase
     end
   end
 
-  def connect
-    TCPSocket.new('127.0.0.1', PORT)
-  end
-
   sub_test_case 'message' do
-    setup do
-      Fluent::Test::StartupShutdown.setup
-    end
-    teardown do
-      Fluent::Test::StartupShutdown.teardown
-    end
-
     test 'time' do
       time = event_time("2011-01-02 13:14:15 UTC")
       begin
@@ -221,6 +203,7 @@ class ForwardInputTest < Test::Unit::TestCase
       d.run(expect_records: records.length, timeout: 20) do
         records.each {|tag, _time, record|
           send_data [tag, _time, record].to_json + "\n"
+        sleep 1
         }
       end
 
@@ -229,13 +212,6 @@ class ForwardInputTest < Test::Unit::TestCase
   end
 
   sub_test_case 'forward' do
-     setup do
-      Fluent::Test::StartupShutdown.setup
-    end
-    teardown do
-      Fluent::Test::StartupShutdown.teardown
-    end
-
     data(tcp: {
            config: CONFIG,
            options: {
@@ -345,13 +321,6 @@ class ForwardInputTest < Test::Unit::TestCase
   end
 
   sub_test_case 'packed forward' do
-    setup do
-      Fluent::Test::StartupShutdown.setup
-    end
-    teardown do
-      Fluent::Test::StartupShutdown.teardown
-    end
-
     data(tcp: {
            config: CONFIG,
            options: {
@@ -464,13 +433,6 @@ class ForwardInputTest < Test::Unit::TestCase
   end
 
   sub_test_case 'compressed packed forward' do
-    setup do
-      Fluent::Test::StartupShutdown.setup
-    end
-    teardown do
-      Fluent::Test::StartupShutdown.teardown
-    end
-
     test 'set_compress_to_option' do
       @d = d = create_driver
 
@@ -528,13 +490,6 @@ class ForwardInputTest < Test::Unit::TestCase
   end
 
   sub_test_case 'warning' do
-    setup do
-      Fluent::Test::StartupShutdown.setup
-    end
-    teardown do
-      Fluent::Test::StartupShutdown.teardown
-    end
-
     test 'send_large_chunk_warning' do
       @d = d = create_driver(CONFIG + %[
         chunk_size_warn_limit 16M
@@ -551,7 +506,7 @@ class ForwardInputTest < Test::Unit::TestCase
 
       d.run(shutdown: false) do
         Fluent::Engine.msgpack_factory.unpacker.feed_each(chunk) do |obj|
-          d.instance.send(:on_message, obj, chunk.size, PEERADDR)
+          d.instance.send(:on_message, obj, chunk.size, '127.0.0.1')
         end
       end
 
@@ -565,7 +520,7 @@ class ForwardInputTest < Test::Unit::TestCase
       logs = d.instance.log.logs
       assert_equal 1, logs.select{|line|
         line =~ / \[warn\]: Input chunk size is larger than 'chunk_size_warn_limit':/ &&
-        line =~ / tag="test.tag" source="host: 127.0.0.1, addr: 127.0.0.1, port: \d+" limit=16777216 size=16777501/
+        line =~ / tag="test.tag" host="127.0.0.1" limit=16777216 size=16777501/
       }.size, "large chunk warning is not logged"
 
       d.instance_shutdown
@@ -583,7 +538,7 @@ class ForwardInputTest < Test::Unit::TestCase
 
       d.run(shutdown: false) do
         Fluent::Engine.msgpack_factory.unpacker.feed_each(chunk) do |obj|
-          d.instance.send(:on_message, obj, chunk.size, PEERADDR)
+          d.instance.send(:on_message, obj, chunk.size, '127.0.0.1')
         end
       end
 
@@ -591,7 +546,7 @@ class ForwardInputTest < Test::Unit::TestCase
       logs = d.instance.log.logs
       assert_equal 1, logs.select{ |line|
         line =~ / \[warn\]: Input chunk size is larger than 'chunk_size_warn_limit':/ &&
-        line =~ / tag="test.tag" source="host: 127.0.0.1, addr: 127.0.0.1, port: \d+" limit=16777216 size=16777501/
+        line =~ / tag="test.tag" host="127.0.0.1" limit=16777216 size=16777501/
       }.size, "large chunk warning is not logged"
 
       d.instance_shutdown
@@ -613,7 +568,7 @@ class ForwardInputTest < Test::Unit::TestCase
       # d.run => send_data
       d.run(shutdown: false) do
         Fluent::Engine.msgpack_factory.unpacker.feed_each(chunk) do |obj|
-          d.instance.send(:on_message, obj, chunk.size, PEERADDR)
+          d.instance.send(:on_message, obj, chunk.size, '127.0.0.1')
         end
       end
 
@@ -625,7 +580,7 @@ class ForwardInputTest < Test::Unit::TestCase
       logs = d.instance.log.logs
       assert_equal 1, logs.select{|line|
         line =~ / \[warn\]: Input chunk size is larger than 'chunk_size_limit', dropped:/ &&
-        line =~ / tag="test.tag" source="host: 127.0.0.1, addr: 127.0.0.1, port: \d+" limit=33554432 size=33554989/
+        line =~ / tag="test.tag" host="127.0.0.1" limit=33554432 size=33554989/
       }.size, "large chunk warning is not logged"
 
       d.instance_shutdown
@@ -638,7 +593,7 @@ class ForwardInputTest < Test::Unit::TestCase
 
       # d.run => send_data
       d.run(shutdown: false) do
-        d.instance.send(:on_message, data, 1000000000, PEERADDR)
+        d.instance.send(:on_message, data, 1000000000, '127.0.0.1')
       end
 
       # check emitted data
@@ -647,7 +602,7 @@ class ForwardInputTest < Test::Unit::TestCase
       # check log
       logs = d.instance.log.logs
       assert_equal 1, logs.select{|line|
-        line =~ / \[warn\]: incoming chunk is broken: source="host: 127.0.0.1, addr: 127.0.0.1, port: \d+" msg=#{data.inspect}/
+        line =~ / \[warn\]: incoming chunk is broken: host="127.0.0.1" msg=#{data.inspect}/
       }.size, "should not accept broken chunk"
 
       d.instance_shutdown
@@ -655,13 +610,6 @@ class ForwardInputTest < Test::Unit::TestCase
   end
 
   sub_test_case 'respond to required ack' do
-    setup do
-      Fluent::Test::StartupShutdown.setup
-    end
-    teardown do
-      Fluent::Test::StartupShutdown.teardown
-    end
-
     data(tcp: {
            config: CONFIG,
            options: {
@@ -824,13 +772,6 @@ class ForwardInputTest < Test::Unit::TestCase
   end
 
   sub_test_case 'not respond without required ack' do
-    setup do
-      Fluent::Test::StartupShutdown.setup
-    end
-    teardown do
-      Fluent::Test::StartupShutdown.teardown
-    end
-
     data(tcp: {
            config: CONFIG,
            options: {
@@ -1068,6 +1009,10 @@ class ForwardInputTest < Test::Unit::TestCase
     true
   end
 
+  def connect
+    TCPSocket.new('127.0.0.1', PORT)
+  end
+
   # Data ordering is not assured:
   #  Records in different sockets are processed on different thread, so its scheduling make effect
   #  on order of emitted records.
@@ -1089,13 +1034,6 @@ class ForwardInputTest < Test::Unit::TestCase
   end
 
   sub_test_case 'source_hostname_key feature' do
-    setup do
-      Fluent::Test::StartupShutdown.setup
-    end
-    teardown do
-      Fluent::Test::StartupShutdown.teardown
-    end
-
     test 'message protocol with source_hostname_key' do
       execute_test { |events|
         events.each { |tag, time, record|

data/test/plugin/test_in_monitor_agent.rb

@@ -30,6 +30,7 @@ class MonitorAgentInputTest < Test::Unit::TestCase
     assert_equal(24220, d.instance.port)
     assert_equal(nil, d.instance.tag)
     assert_equal(60, d.instance.emit_interval)
+    assert_true d.instance.include_config
   end
 
   sub_test_case "collect plugin information" do
@@ -90,48 +91,37 @@ EOC
       assert_equal("output", d.instance.plugin_category(error_label.outputs.first))
     end
 
-    test "get_monitor_info" do
+    data(:with_config_yes => true,
+         :with_config_no => false)
+    test "get_monitor_info" do |with_config|
       d = create_driver
       test_label = @ra.labels['@test']
       error_label = @ra.labels['@ERROR']
       input_info = {
-        "config" => {
-          "@id"   => "test_in",
-          "@type" => "test_in"
-        },
         "output_plugin"  => false,
         "plugin_category"=> "input",
         "plugin_id"      => "test_in",
         "retry_count"    => nil,
         "type"           => "test_in"
       }
+      input_info.merge!("config" => {"@id" => "test_in", "@type" => "test_in"}) if with_config
       filter_info = {
-        "config" => {
-          "@id"   => "test_filter",
-          "@type" => "test_filter"
-        },
         "output_plugin"   => false,
         "plugin_category" => "filter",
         "plugin_id"       => "test_filter",
         "retry_count"     => nil,
         "type"            => "test_filter"
       }
+      filter_info.merge!("config" => {"@id" => "test_filter", "@type" => "test_filter"}) if with_config
       output_info = {
-        "config" => {
-          "@id"   => "test_out",
-          "@type" => "test_out"
-        },
         "output_plugin"   => true,
         "plugin_category" => "output",
         "plugin_id"       => "test_out",
         "retry_count"     => 0,
         "type"            => "test_out"
       }
+      output_info.merge!("config" => {"@id" => "test_out", "@type" => "test_out"}) if with_config
       error_label_info = {
-        "config" => {
-          "@id"=>"null",
-          "@type" => "null"
-        },
         "buffer_queue_length" => 0,
         "buffer_total_queued_size" => 0,
         "output_plugin"   => true,
@@ -140,10 +130,12 @@ EOC
         "retry_count"     => 0,
         "type"            => "null"
       }
-      assert_equal(input_info, d.instance.get_monitor_info(@ra.inputs.first))
-      assert_equal(filter_info, d.instance.get_monitor_info(@ra.filters.first))
-      assert_equal(output_info, d.instance.get_monitor_info(test_label.outputs.first))
-      assert_equal(error_label_info, d.instance.get_monitor_info(error_label.outputs.first))
+      error_label_info.merge!("config" => {"@id"=>"null", "@type" => "null"}) if with_config
+      opts = {with_config: with_config}
+      assert_equal(input_info, d.instance.get_monitor_info(@ra.inputs.first, opts))
+      assert_equal(filter_info, d.instance.get_monitor_info(@ra.filters.first, opts))
+      assert_equal(output_info, d.instance.get_monitor_info(test_label.outputs.first, opts))
+      assert_equal(error_label_info, d.instance.get_monitor_info(error_label.outputs.first, opts))
     end
 
     test "fluentd opts" do
@@ -207,7 +199,7 @@ EOC
 
   def get(uri, header = {})
     url = URI.parse(uri)
-    req = Net::HTTP::Get.new(url.path, header)
+    req = Net::HTTP::Get.new(url, header)
     unless header.has_key?('Content-Type')
       header['Content-Type'] = 'application/octet-stream'
     end
@@ -258,6 +250,8 @@ EOC
       @ra = Fluent::RootAgent.new(log: $log)
       stub(Fluent::Engine).root_agent { @ra }
       @ra = configure_ra(@ra, conf)
+      # store Supervisor instance to avoid collected by GC
+      @supervisor = Fluent::Supervisor.new(Fluent::Supervisor.default_options)
     end
 
     test "/api/plugins" do
@@ -280,36 +274,36 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
       assert_equal(expected_test_filter_response, test_filter)
     end
 
-    test "/api/plugins.json" do
+    data(:include_config_yes => [true, "include_config yes"],
+         :include_config_no => [false, "include_config no"])
+    test "/api/plugins.json" do |(with_config, include_conf)|
+
       d = create_driver("
   @type monitor_agent
   bind '127.0.0.1'
   port #{@port}
   tag monitor
+  #{include_conf}
 ")
       d.instance.start
-      expected_test_in_response =
-        {"config" => {
-          "@id"   => "test_in",
-          "@type" => "test_in"
-        },
+      expected_test_in_response = {
         "output_plugin"   => false,
         "plugin_category" => "input",
         "plugin_id"       => "test_in",
         "retry_count"     => nil,
-        "type"            => "test_in"}
-      expected_null_response =
-        {"config" => {
-          "@id"   => "null",
-          "@type" => "null"
-        },
+        "type"            => "test_in"
+      }
+      expected_test_in_response.merge!("config" => {"@id" => "test_in", "@type" => "test_in"}) if with_config
+      expected_null_response = {
         "buffer_queue_length" => 0,
         "buffer_total_queued_size" => 0,
         "output_plugin"   => true,
         "plugin_category" => "output",
         "plugin_id"       => "null",
         "retry_count"     => 0,
-        "type"            => "null"}
+        "type"            => "null"
+      }
+      expected_null_response.merge!("config" => {"@id" => "null", "@type" => "null"}) if with_config
       response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json"))
       test_in_response = response["plugins"][0]
       null_response = response["plugins"][5]
@@ -317,6 +311,42 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
       assert_equal(expected_null_response, null_response)
     end
 
+    data(:with_config_yes => [true, "?with_config=yes"],
+         :with_config_no => [false, "?with_config=no"])
+    test "/api/plugins.json with query parameter. query parameter is preferred than include_config" do |(with_config, query_param)|
+
+      d = create_driver("
+  @type monitor_agent
+  bind '127.0.0.1'
+  port #{@port}
+  tag monitor
+")
+      d.instance.start
+      expected_test_in_response = {
+        "output_plugin"   => false,
+        "plugin_category" => "input",
+        "plugin_id"       => "test_in",
+        "retry_count"     => nil,
+        "type"            => "test_in"
+      }
+      expected_test_in_response.merge!("config" => {"@id" => "test_in", "@type" => "test_in"}) if with_config
+      expected_null_response = {
+        "buffer_queue_length" => 0,
+        "buffer_total_queued_size" => 0,
+        "output_plugin"   => true,
+        "plugin_category" => "output",
+        "plugin_id"       => "null",
+        "retry_count"     => 0,
+        "type"            => "null"
+      }
+      expected_null_response.merge!("config" => {"@id" => "null", "@type" => "null"}) if with_config
+      response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json#{query_param}"))
+      test_in_response = response["plugins"][0]
+      null_response = response["plugins"][5]
+      assert_equal(expected_test_in_response, test_in_response)
+      assert_equal(expected_null_response, null_response)
+    end
+
     test "/api/config" do
       d = create_driver("
   @type monitor_agent

data/test/plugin/test_in_syslog.rb

@@ -176,7 +176,41 @@ class SyslogInputTest < Test::Unit::TestCase
     end
 
     assert(d.events.size > 0)
-    compare_test_result(d.events, tests, host)
+    compare_test_result(d.events, tests, {host: host})
+  end
+
+  def test_msg_size_with_include_priority
+    d = create_driver([CONFIG, 'priority_key priority'].join("\n"))
+    tests = create_test_case
+
+    priority = 'info'
+    d.run(expect_emits: 2) do
+      u = UDPSocket.new
+      u.connect('127.0.0.1', PORT)
+      tests.each {|test|
+        u.send(test['msg'], 0)
+      }
+    end
+
+    assert(d.events.size > 0)
+    compare_test_result(d.events, tests, {priority: priority})
+  end
+
+  def test_msg_size_with_include_facility
+    d = create_driver([CONFIG, 'facility_key facility'].join("\n"))
+    tests = create_test_case
+
+    facility = 'kern'
+    d.run(expect_emits: 2) do
+      u = UDPSocket.new
+      u.connect('127.0.0.1', PORT)
+      tests.each {|test|
+        u.send(test['msg'], 0)
+      }
+    end
+
+    assert(d.events.size > 0)
+    compare_test_result(d.events, tests, {facility: facility})
   end
 
   def create_test_case(large_message: false)
@@ -195,11 +229,13 @@ class SyslogInputTest < Test::Unit::TestCase
     end
   end
 
-  def compare_test_result(events, tests, host = nil)
+  def compare_test_result(events, tests, options = {})
     events.each_index { |i|
       assert_equal('syslog.kern.info', events[i][0]) # <6> means kern.info
       assert_equal(tests[i]['expected'], events[i][2]['message'])
-      assert_equal(host, events[i][2]['source_host']) if host
+      assert_equal(options[:host], events[i][2]['source_host']) if options[:host]
+      assert_equal(options[:priority], events[i][2]['priority']) if options[:priority]
+      assert_equal(options[:facility], events[i][2]['facility']) if options[:facility]
     }
   end
 end