fluentd 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d97f061ed5f540026a4cae384b2508ee503be4dcb0ef836d37e118a541477df
-  data.tar.gz: 82edeaa9350871f8ba1b38d966cfc331f56c5ba97464c3dd14fb2bf7005a1bb5
+  metadata.gz: 1fef23fb6e94b2100154a4ef1618ad628435118b13fc9c1f6884e69ecc221368
+  data.tar.gz: 6d1eb5b941ce9df4987fcf19f0345d46965534d858205ed07c71c67e7b8c2966
 SHA512:
-  metadata.gz: 7966763ba1215bde1a571f500dedaf5a100b6e72f14fb8b8121e09ca7d3fe697e4c6910b3dd7f844bd3d86484f0ea656997baff81fd9332aab94a898ff2e74d7
-  data.tar.gz: be65ac015fc43ac71d52ad3a2bb628e904a285918588b31102ecdf51e84af689ef77007028b30c72a9ecc25aa01e50a88091f136829396bf7cacaa608312b591
+  metadata.gz: b426456c884540d5bd9aafbd0c7e3f5dec5a64db50ce631a09a93d2dfee1adeff8f96f051ffc4702ac464ea91d05a485866838f0ea383380d397a3073363da67
+  data.tar.gz: 34791ef0f1498fc68e27935ed3d9f1393d1aaa28f39ee1718f679f5aef2c8c0094301d49edbde5b793651a8226efe7f070ab4f422dffe7da2a6bc833f297cf6a

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # v1.6
 
+## Release v1.6.1 - 2019/07/10
+
+### Enhancement
+
+* socket/cert: Support all private keys OpenSSL supports, not only RSA.
+  https://github.com/fluent/fluentd/pull/2487
+* output/buffer: Improve statistics method performance
+  https://github.com/fluent/fluentd/pull/2491
+
+### Bug fixes
+
+* plugin_config_formatter: update new doc URL
+  https://github.com/fluent/fluentd/pull/2481
+* out_forward: Avoid zero division error when there are no available nodes
+  https://github.com/fluent/fluentd/pull/2482
+
 ## Release v1.6.0 - 2019/07/01
 
 ### New feature

data/README.md

@@ -13,7 +13,7 @@ GitLab CI:
 [Fluentd](https://www.fluentd.org/) collects events from various data sources and writes them to files, RDBMS, NoSQL, IaaS, SaaS, Hadoop and so on. Fluentd helps you unify your logging infrastructure (Learn more about the [Unified Logging Layer](https://www.fluentd.org/blog/unified-logging-layer)).
 
 <p align="center">
-<img src="https://docs.fluentd.org/images/fluentd-architecture.png" width="500px"/>
+<img src="https://raw.githubusercontent.com/fluent/fluentd-docs-gitbook/1.0/images/fluentd-architecture.png" width="500px"/>
 </p>
 
 An event consists of *tag*, *time* and *record*. Tag is a string separated with '.' (e.g. myapp.access). It is used to categorize events. Time is a UNIX time recorded at occurrence of an event. Record is a JSON object.

data/lib/fluent/command/ca_generate.rb

@@ -91,7 +91,7 @@ HELP
     def self.generate_server_pair(opts={})
       key = OpenSSL::PKey::RSA.generate(opts[:private_key_length])
 
-      ca_key = OpenSSL::PKey::RSA.new(File.read(opts[:ca_key_path]), opts[:ca_key_passphrase])
+      ca_key = OpenSSL::PKey::read(File.read(opts[:ca_key_path]), opts[:ca_key_passphrase])
       ca_cert = OpenSSL::X509::Certificate.new(File.read(opts[:ca_cert_path]))
       issuer = ca_cert.issuer
 

data/lib/fluent/command/plugin_config_formatter.rb

@@ -32,8 +32,8 @@ class FluentPluginConfigFormatter
     "buffer", "parser", "formatter", "storage"
   ]
 
-  DOCS_BASE_URL = "https://docs.fluentd.org/v1.0/articles/quickstart"
-  DOCS_ARTICLE_BASE_URL = "https://docs.fluentd.org/v1.0/articles/"
+  DOCS_BASE_URL = "https://docs.fluentd.org/v/1.0"
+  DOCS_PLUGIN_HELPER_BASE_URL = "#{DOCS_BASE_URL}/plugin-helper-overview/"
 
   def initialize(argv = ARGV)
     @argv = argv
@@ -198,7 +198,7 @@ class FluentPluginConfigFormatter
   end
 
   def plugin_helper_url(plugin_helper)
-    "#{DOCS_ARTICLE_BASE_URL}api-plugin-helper-#{plugin_helper}"
+    "#{DOCS_PLUGIN_HELPER_BASE_URL}api-plugin-helper-#{plugin_helper}"
   end
 
   def plugin_helper_markdown_link(plugin_helper)
@@ -207,7 +207,7 @@ class FluentPluginConfigFormatter
 
   def plugin_overview_url(class_name)
     plugin_type = class_name.slice(/::(\w+)\z/, 1).downcase
-    "#{DOCS_ARTICLE_BASE_URL}#{plugin_type}-plugin-overview"
+    "#{DOCS_BASE_URL}/#{plugin_type}#overview"
   end
 
   def plugin_overview_markdown_link(class_name)

data/lib/fluent/plugin/buffer.rb

@@ -741,15 +741,27 @@ module Fluent
         retry
       end
 
+      STATS_KEYS = [
+        'stage_length',
+        'stage_byte_size',
+        'queue_length',
+        'queue_byte_size',
+        'available_buffer_space_ratios',
+        'total_queued_size',
+        'oldest_timekey',
+        'newest_timekey'
+      ]
+
       def statistics
-        buffer_space = 1.0 - ((@stage_size + @queue_size * 1.0) / @total_limit_size).round
+        stage_size, queue_size = @stage_size, @queue_size
+        buffer_space = 1.0 - ((stage_size + queue_size * 1.0) / @total_limit_size).round
         stats = {
           'stage_length' => @stage.size,
-          'stage_byte_size' => @stage_size,
+          'stage_byte_size' => stage_size,
           'queue_length' => @queue.size,
-          'queue_byte_size' => @queue_size,
+          'queue_byte_size' => queue_size,
           'available_buffer_space_ratios' => buffer_space * 100,
-          'total_queued_size' => @stage_size + @queue_size,
+          'total_queued_size' => stage_size + queue_size,
         }
 
         if (m = timekeys.min)

data/lib/fluent/plugin/out_forward.rb

@@ -428,6 +428,12 @@ module Fluent::Plugin
       end
 
       weight_array = []
+      if regular_nodes.empty?
+        log.warn('No nodes are available')
+        @weight_array = weight_array
+        return @weight_array
+      end
+
       gcd = regular_nodes.map {|n| n.weight }.inject(0) {|r,w| r.gcd(w) }
       regular_nodes.each {|n|
         (n.weight / gcd).times {

data/lib/fluent/plugin/output.rb

@@ -16,6 +16,7 @@
 
 require 'fluent/error'
 require 'fluent/plugin/base'
+require 'fluent/plugin/buffer'
 require 'fluent/plugin_helper/record_accessor'
 require 'fluent/log'
 require 'fluent/plugin_id'
@@ -1466,6 +1467,11 @@ module Fluent
         end
       end
 
+      BUFFER_STATS_KEYS = {}
+      Fluent::Plugin::Buffer::STATS_KEYS.each { |key|
+        BUFFER_STATS_KEYS[key] = "buffer_#{key}"
+      }
+
       def statistics
         stats = {
           'emit_records' => @emit_records,
@@ -1481,7 +1487,7 @@ module Fluent
 
         if @buffer && @buffer.respond_to?(:statistics)
           (@buffer.statistics['buffer'] || {}).each do |k, v|
-            stats["buffer_#{k}"] = v
+            stats[BUFFER_STATS_KEYS[k]] = v
           end
         end
 

data/lib/fluent/plugin_helper/cert_option.rb

@@ -76,7 +76,7 @@ module Fluent
       end
 
       def cert_option_load(cert_path, private_key_path, private_key_passphrase)
-        key = OpenSSL::PKey::RSA.new(File.read(private_key_path), private_key_passphrase)
+        key = OpenSSL::PKey::read(File.read(private_key_path), private_key_passphrase)
         certs = cert_option_certificates_from_file(cert_path)
         cert = certs.shift
         return cert, key, certs
@@ -137,7 +137,7 @@ module Fluent
       end
 
       def cert_option_generate_server_pair_by_ca(ca_cert_path, ca_key_path, ca_key_passphrase, generate_opts)
-        ca_key = OpenSSL::PKey::RSA.new(File.read(ca_key_path), ca_key_passphrase)
+        ca_key = OpenSSL::PKey::read(File.read(ca_key_path), ca_key_passphrase)
         ca_cert = OpenSSL::X509::Certificate.new(File.read(ca_cert_path))
         cert, key = cert_option_generate_pair(generate_opts, ca_cert.subject)
         raise "BUG: certificate digest algorithm not set" unless generate_opts[:digest]

data/lib/fluent/plugin_helper/socket.rb

@@ -139,7 +139,7 @@ module Fluent
           context.cert_store = cert_store
           context.verify_hostname = true if verify_fqdn && fqdn && context.respond_to?(:verify_hostname=)
           context.cert = OpenSSL::X509::Certificate.new(File.read(cert_path)) if cert_path
-          context.key = OpenSSL::PKey::RSA.new(File.read(private_key_path), private_key_passphrase) if private_key_path
+          context.key = OpenSSL::PKey::read(File.read(private_key_path), private_key_passphrase) if private_key_path
         end
 
         tcpsock = socket_create_tcp(host, port, **kwargs)

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 
 end

data/test/command/test_plugin_config_formatter.rb

@@ -180,10 +180,10 @@ TEXT
       expected = <<TEXT
 ## Plugin helpers
 
-* [inject](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-inject)
-* [compat_parameters](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-compat_parameters)
+* [inject](https://docs.fluentd.org/v/1.0/plugin-helper-overview/api-plugin-helper-inject)
+* [compat_parameters](https://docs.fluentd.org/v/1.0/plugin-helper-overview/api-plugin-helper-compat_parameters)
 
-* See also: [Input Plugin Overview](https://docs.fluentd.org/v1.0/articles/input-plugin-overview)
+* See also: [Input Plugin Overview](https://docs.fluentd.org/v/1.0/input#overview)
 
 ## TestFluentPluginConfigFormatter::SimpleInput
 
@@ -203,10 +203,10 @@ TEXT
       expected = <<TEXT
 ## Plugin helpers
 
-* [inject](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-inject)
-* [compat_parameters](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-compat_parameters)
+* [inject](https://docs.fluentd.org/v/1.0/plugin-helper-overview/api-plugin-helper-inject)
+* [compat_parameters](https://docs.fluentd.org/v/1.0/plugin-helper-overview/api-plugin-helper-compat_parameters)
 
-* See also: [Output Plugin Overview](https://docs.fluentd.org/v1.0/articles/output-plugin-overview)
+* See also: [Output Plugin Overview](https://docs.fluentd.org/v/1.0/output#overview)
 
 ## TestFluentPluginConfigFormatter::ComplexOutput
 

data/test/plugin/test_out_forward.rb

@@ -1010,6 +1010,20 @@ EOL
     end
   end
 
+  test 'if no available node' do
+    # do not create output driver
+    d = create_driver(%[
+    <server>
+      name test
+      standby
+      host #{TARGET_HOST}
+      port #{TARGET_PORT}
+    </server>
+    ])
+    d.instance_start
+    assert_nothing_raised { d.run }
+  end
+
   sub_test_case 'keepalive' do
     test 'Do not create connection per send_data' do
       target_input_driver = create_target_input_driver(conf: TARGET_CONFIG)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack