fluent-plugin-mqtt-io 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea9384521f10b7caf8a29d7e1fc0e232e9a3a1c7
-  data.tar.gz: 0f656339bd4d72eb7a9b4bb1c2303994a532b8e2
+  metadata.gz: 3782aca018e523e428d463853e6bab8419f005ca
+  data.tar.gz: bec45595691338a9c383bb41925d14bf8815b685
 SHA512:
-  metadata.gz: 52eabe67a7a94c3dd93d9bdc831fd226cafb990eb3c37df4dd652fc73161c801231f4aa84036506597b20b4f7b0a9711b85325977df6b87e6f3d9c065298a3c6
-  data.tar.gz: a7df1e0b1bd500eb83b7382249b12e3c48007713e4d3369e80eeb5214fa89931597e4db877dc7902c0325f6e8fedc4077551c916e5c36e470c6eab5875d22f93
+  metadata.gz: cfb2568422ebd1239ab1f50d59d9238fd0e8ccf71bd5bfe2e84487ac93580f9ab1990d64a519ae2751fd78bf7066e8258925656528e33fb79b910e2502c887af
+  data.tar.gz: 9eba2f2086abd8f94995248e032d76aae10fe5f3a3ca204a28a1d0e752288464aca0e08ebcf9525223b706aedfc3e73a47947a60ad38c4c265bc159a6699497c

data/README.md

@@ -63,6 +63,7 @@ The default MQTT topic is "#". Configurable options are the following:
 
 - **host**: IP address of MQTT broker
 - **port**: Port number of MQTT broker
+- **client_id**: Client ID that to connect to MQTT broker
 - **format** (mandatory): Input parser can be chosen, e.g. json, xml
   - In order to use xml format, you need to install [fluent-plugin-xml-parser](https://github.com/toyokazu/fluent-plugin-xml-parser).
   - Default time_key field for json format is 'time'

data/fluent-plugin-mqtt-io.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mqtt-io"
-  spec.version       = "0.3.8"
+  spec.version       = "0.3.9"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
 

data/lib/fluent/plugin/mqtt_proxy.rb

@@ -10,6 +10,8 @@ module Fluent::Plugin
       base.config_param :host, :string, default: '127.0.0.1'
       base.desc 'The port to connect to.'
       base.config_param :port, :integer, default: MQTT_PORT
+      base.desc 'Client ID of MQTT Connection'
+      base.config_param :client_id, :string, default: nil
       base.desc 'Specify keep alive interval.'
       base.config_param :keep_alive, :integer, default: 15
       base.desc 'Specify initial connection retry interval.'
@@ -21,19 +23,19 @@ module Fluent::Plugin
 
       base.config_section :security, required: false, multi: false do
         ### User based authentication
-        base.desc 'The username for authentication'
-        base.config_param :username, :string, default: nil
-        base.desc 'The password for authentication'
-        base.config_param :password, :string, default: nil
-        base.desc 'Use TLS or not.'
-        base.config_param :use_tls, :bool, default: nil
-        base.config_section :tls, required: false, multi: true do
-          base.desc 'Specify TLS ca file.'
-          base.config_param :ca_file, :string, default: nil
-          base.desc 'Specify TLS key file.'
-          base.config_param :key_file, :string, default: nil
-          base.desc 'Specify TLS cert file.'
-          base.config_param :cert_file, :string, default: nil
+        desc 'The username for authentication'
+        config_param :username, :string, default: nil
+        desc 'The password for authentication'
+        config_param :password, :string, default: nil
+        desc 'Use TLS or not.'
+        config_param :use_tls, :bool, default: nil
+        config_section :tls, required: false, multi: false do
+          desc 'Specify TLS ca file.'
+          config_param :ca_file, :string, default: nil
+          desc 'Specify TLS key file.'
+          config_param :key_file, :string, default: nil
+          desc 'Specify TLS cert file.'
+          config_param :cert_file, :string, default: nil
         end
       end
     end
@@ -51,11 +53,12 @@ module Fluent::Plugin
       opts = {
         host: @host,
         port: @port,
+        client_id: @client_id,
         keep_alive: @keep_alive
       }
-      opts[:username] = @security.username if @security.respond_to?(:username)
-      opts[:password] = @security.password if @security.respond_to?(:password)
-      if @security.respond_to?(:use_tls) && @security.use_tls
+      opts[:username] = @security.username if @security.to_h.has_key?(:username)
+      opts[:password] = @security.password if @security.to_h.has_key?(:password)
+      if @security.to_h.has_key?(:use_tls) && @security.use_tls
         opts[:ssl] = @security.use_tls
         opts[:ca_file] = @security.tls.ca_file
         opts[:cert_file] = @security.tls.cert_file

data/lib/fluent/plugin/out_mqtt.rb

@@ -12,6 +12,7 @@ module Fluent::Plugin
 
     helpers :compat_parameters, :formatter, :inject
 
+
     desc 'Topic rewrite matching pattern.'
     config_param :topic_rewrite_pattern, :string, default: nil
     desc 'Topic rewrite replacement string.'

data/test/plugin/test_in_mqtt.rb

@@ -11,7 +11,7 @@ class MqttInputTest < Test::Unit::TestCase
   CONFIG = %[
   ]
 
-  def create_driver(conf = CONFIG, opts = {}) 
+  def create_driver(conf = CONFIG, opts = {})
     Fluent::Test::Driver::Input.new(Fluent::Plugin::MqttInput, opts: opts).configure(conf)
   end
 
@@ -20,13 +20,30 @@ class MqttInputTest < Test::Unit::TestCase
       d = create_driver %[
           host 127.0.0.1
           port 1300
+          client_id aa-bb-cc-dd
           <parse>
             @type json
             time_format %FT%T%:z
           </parse>
+          <security>
+            use_tls true
+            <tls>
+              ca_file /cert/cacert.pem
+              key_file /cert/private.key
+              cert_file /cert/cert.pem
+            </tls>
+          </security>
+
       ]
       assert_equal '127.0.0.1', d.instance.host
       assert_equal 1300, d.instance.port
+      assert_equal 'aa-bb-cc-dd', d.instance.client_id
+
+      assert_equal true, d.instance.security.use_tls
+      assert_equal '/cert/cacert.pem', d.instance.security.tls.ca_file
+      assert_equal '/cert/private.key', d.instance.security.tls.key_file
+      assert_equal '/cert/cert.pem', d.instance.security.tls.cert_file
+
     end
   end
 end

data/test/plugin/test_out_mqtt.rb

@@ -11,7 +11,7 @@ class MqttOutputTest < Test::Unit::TestCase
   CONFIG = %[
   ]
 
-  def create_driver(conf = CONFIG, opts = {}) 
+  def create_driver(conf = CONFIG, opts = {})
     Fluent::Test::Driver::Output.new(Fluent::Plugin::MqttOutput, opts: opts).configure(conf)
   end
 
@@ -20,12 +20,31 @@ class MqttOutputTest < Test::Unit::TestCase
       d = create_driver %[
         host 127.0.0.1
         port 1300
+        client_id aa-bb-cc-dd
         <format>
           @type json
         </format>
+        <monitor>
+          send_time true
+        </monitor>
+        <security>
+          use_tls true
+          <tls>
+            ca_file /cert/cacert.pem
+            key_file /cert/private.key
+            cert_file /cert/cert.pem
+          </tls>
+        </security>
       ]
       assert_equal '127.0.0.1', d.instance.host
       assert_equal 1300, d.instance.port
-    end
+      assert_equal true, d.instance.monitor.send_time
+      assert_equal 'aa-bb-cc-dd', d.instance.client_id
+
+      assert_equal true, d.instance.security.use_tls
+      assert_equal '/cert/cacert.pem', d.instance.security.tls.ca_file
+      assert_equal '/cert/private.key', d.instance.security.tls.key_file
+      assert_equal '/cert/cert.pem', d.instance.security.tls.cert_file
+   end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mqtt-io
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: []
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd