fluent-plugin-rabbitmq 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cef75c71139acf25212c8ef531cf9f2389aa098a580693e1d4d9b773f5872053
-  data.tar.gz: 129fd5009bd1c3c11ae44af7a32a6369d795f6a8a4ca66100c0542c627de9e25
+  metadata.gz: b176f575d9bab4d2bb68bff2a8790e88df1c0f7df266ee0f725f364e14e49c47
+  data.tar.gz: 73484875820d9c48ab7c828f49f43e31ec4c067a34dc3b549fe72d9cc261e0e6
 SHA512:
-  metadata.gz: 226940ef7e8923648c97757a6d9a238a062840653e4369317ed93c69539d0d7c4eeb00f0e7982d6569e0943fbe5120507a931e3382ffca3efdc50ce68d82b8fa
-  data.tar.gz: 81be12b79ff0467a6d319899395310f24100eb626a4ae18cb2cae64518d3dc0870df17966ac9a5ac4c8dab04f846f2418a65386b523d4afb5a9d19cac726dd19
+  metadata.gz: c0c82dbfd41cd7aa0b4ff3642580896c2449dbcf905e77ce2aff0ad5a6ccc5a9f78a167a222e61698b99f4d2c10e98b143beb1e975f41ee0ce8031db52e499b6
+  data.tar.gz: 043bc89bb9df0097943a88fdfa9bc1da3b45b4030fa8636fdd16bdb8626492c92c9c59ed5d296d6bc7f4d112dc5f76c7d94c7fcdaf9f6099b8e5d349c49a8d55

data/README.md

@@ -47,11 +47,14 @@ fluentd >= 0.14.0
 |durable|true|false|set durable flag of the queue|
 |exclusive|true|false|set exclusive flag of the queue|
 |auto_delete|true|false|set auto_delete flag of the queue|
+|queue_no_declare|true|false|passive declare option for queue|
 |ttl|60000|nil|queue ttl in ms|
 |prefetch_count|10|nil||
 |consumer_pool_size|5|nil||
 |include_headers|true|false|include headers in events|
 |headers_key|string|header|key name of headers|
+|include_properties|true|false|include AMQP basic properties (content_type, content_encoding, delivery_mode, priority, correlation_id, reply_to, expiration, message_id, timestamp, type, user_id, app_id, cluster_id) in events|
+|properties_key|string|properties|key name of properties|
 |create_exchange|true|false|create exchange or not|
 |exchange_to_bind|string|nil|exchange to bind created exchange|
 |exchange_type|direct|topic|type of created exchange|
@@ -110,6 +113,8 @@ tls_cert /path/to/cert
 tls_key /path/to/key
 tls_ca_certificates ["/path/to/ca_certificate"]
 verify_peer true
+tls_protocol TLSv1_3 # pin a TLS version instead of negotiating, e.g. TLSv1_2 or TLSv1_3
+tls_silence_warnings false # suppress Bunny's warnings about a missing client certificate and disabled peer verification
 ```
 
 ### Other Configurations for Input/Output

data/fluent-plugin-rabbitmq.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-rabbitmq"
-  spec.version       = "0.1.5"
+  spec.version       = "0.1.7"
   spec.authors       = ["NTT DOCOMO BUSINESS"]
   spec.email         = ["masaki.matsushita@ntt.com"]
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ltsv"
   spec.add_development_dependency "msgpack"
 
-  spec.add_runtime_dependency "fluentd", ">= 1.0.0"
+  spec.add_runtime_dependency "fluentd", ">= 1.0"
 
-  spec.add_dependency "bunny", "~> 2.14.4"
+  spec.add_dependency "bunny", "~> 3.4"
 end

data/lib/fluent/plugin/in_rabbitmq.rb

@@ -53,24 +53,30 @@ module Fluent::Plugin
     config_param :exchange_type, :string, default: "topic"
     config_param :exchange_routing_key, :string, default: nil
     config_param :exchange_durable, :bool, default: false
+    config_param :exchange_no_declare, :bool, default: false
     
     config_param :tls, :bool, default: false
     config_param :tls_cert, :string, default: nil
     config_param :tls_key, :string, default: nil
     config_param :tls_ca_certificates, :array, default: nil
     config_param :verify_peer, :bool, default: true
+    config_param :tls_protocol, :string, default: nil
+    config_param :tls_silence_warnings, :bool, default: nil
 
     config_param :queue, :string
     config_param :durable, :bool, default: false
     config_param :exclusive, :bool, default: false
     config_param :auto_delete, :bool, default: false
+    config_param :queue_no_declare, :bool, default: false
     config_param :prefetch_count, :integer, default: nil
     config_param :ttl, :integer, default: nil
 
     config_param :include_headers, :bool, default: false
     config_param :include_delivery_info, :bool, default: false
+    config_param :include_properties, :bool, default: false
     config_param :headers_key, :string, default: "headers"
     config_param :delivery_info_key, :string, default: "delivery_info"
+    config_param :properties_key, :string, default: "properties"
     config_param :manual_ack, :bool, default: false
     config_param :queue_mode, :string, default: nil
     config_param :queue_type, :string, default: nil
@@ -105,6 +111,9 @@ module Fluent::Plugin
       bunny_options[:tls_key] = @tls_key if @tls_key
       bunny_options[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
       bunny_options[:verify_peer] = @verify_peer
+      # Bunny resolves the version against a table keyed by symbols, e.g. :TLSv1_3
+      bunny_options[:tls_protocol] = @tls_protocol.to_sym if @tls_protocol
+      bunny_options[:tls_silence_warnings] = @tls_silence_warnings unless @tls_silence_warnings.nil?
 
       @parser = parser_create
 
@@ -120,7 +129,8 @@ module Fluent::Plugin
       if @create_exchange
         exchange_options = {
             durable: @exchange_durable,
-            auto_delete: @auto_delete
+            auto_delete: @auto_delete,
+            no_declare: @exchange_no_declare
         }
         @bunny_exchange = Bunny::Exchange.new(channel, @exchange_type, @exchange, exchange_options)
         if @exchange_to_bind
@@ -136,6 +146,7 @@ module Fluent::Plugin
         durable: @durable,
         exclusive: @exclusive,
         auto_delete: @auto_delete,
+        no_declare: @queue_no_declare,
         arguments: queue_arguments
       )
       if @exchange
@@ -156,6 +167,23 @@ module Fluent::Plugin
             if @include_delivery_info
               record[@delivery_info_key] = delivery_info
             end
+            if @include_properties
+              record[@properties_key] = {
+                "content_type"     => properties[:content_type],
+                "content_encoding" => properties[:content_encoding],
+                "delivery_mode"    => properties[:delivery_mode],
+                "priority"         => properties[:priority],
+                "correlation_id"   => properties[:correlation_id],
+                "reply_to"         => properties[:reply_to],
+                "expiration"       => properties[:expiration],
+                "message_id"       => properties[:message_id],
+                "timestamp"        => properties[:timestamp] ? properties[:timestamp].to_i : nil,
+                "type"             => properties[:type],
+                "user_id"          => properties[:user_id],
+                "app_id"           => properties[:app_id],
+                "cluster_id"       => properties[:cluster_id]
+              }
+            end
             router.emit(@tag, time, record)
           end
         rescue Fluent::Plugin::Parser::ParserError => e

data/lib/fluent/plugin/out_rabbitmq.rb

@@ -48,6 +48,8 @@ module Fluent::Plugin
     config_param :tls_key, :string, default: nil
     config_param :tls_ca_certificates, :array, default: nil
     config_param :verify_peer, :bool, default: true
+    config_param :tls_protocol, :string, default: nil
+    config_param :tls_silence_warnings, :bool, default: nil
 
     config_param :exchange, :string
     config_param :exchange_type, :string
@@ -96,6 +98,9 @@ module Fluent::Plugin
       bunny_options[:tls_key] = @tls_key if @tls_key
       bunny_options[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
       bunny_options[:verify_peer] = @verify_peer
+      # Bunny resolves the version against a table keyed by symbols, e.g. :TLSv1_3
+      bunny_options[:tls_protocol] = @tls_protocol.to_sym if @tls_protocol
+      bunny_options[:tls_silence_warnings] = @tls_silence_warnings unless @tls_silence_warnings.nil?
 
       @bunny = Bunny.new(bunny_options)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - NTT DOCOMO BUSINESS
@@ -85,28 +85,28 @@ dependencies:
     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: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.4
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.4
+        version: '3.4'
 description: fluent plugin for rabbitmq (AMQP)
 email:
 - masaki.matsushita@ntt.com