fluent-plugin-azureeventhubs 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0e21c7faa856d74f4f8f195b71e065525213a47
-  data.tar.gz: 79c2b13e680d28b268003b6013c5769d295f082e
+  metadata.gz: 6ede9600a7b9c4e5982441557ec61f97184f92b5
+  data.tar.gz: ed8de13ef5ec60d62c3355c7e6303011c251a679
 SHA512:
-  metadata.gz: f50fd3712de1735926668d0f957d46104730d7789b35f7e23928db89385c6a2881c960649129c45d2dfa7f5b2461a517e951d464bd6b6e6c9394f9a07819a7ae
-  data.tar.gz: b67f030f8d6827bcc51e89853e06db30e61f8f4f220ca9ffe076094474ff332e8ffd4f86e173fb834e353ab2357e7e2ccb9e76fb9fc95517a0eedf5a8b3be8e9
+  metadata.gz: c96be30e30758af12ada78679b11f8f5376b9c17b6de0412c717f231f593b56ee7ebe502bc3434e5e9cd3301c4e72fd4974d8f852ea9da4a91cada829136a7b1
+  data.tar.gz: 418e833fff7d3ccc05c4e33b395f02edc4fa3bb81f0e0b80157e3f21c4d0cb68bc6613e338715cf3ae52e547bb55234fde7507c54cc3d974ebe64476f08a6f63

data/.gitignore

@@ -1,14 +1,14 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in fluent-plugin-azureeventhubs.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-azureeventhubs.gemspec
+gemspec

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2014 Hidemasa Togashi
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2014 Hidemasa Togashi
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,47 +1,48 @@
-# Fluent::Plugin::Azureeventhubs
-
-Azure Event Hubs buffered output plugin for Fluentd.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'fluent-plugin-azureeventhubs'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install fluent-plugin-azureeventhubs
-
-## Configuration
-
-```
-<match pattern>
-  type azureeventhubs_buffered
-
-  connection_string <Paste SAS connection string from Azure Management Potal>
-  hub_name          <Name of Event Hubs>
-  include_tag       (true|false) # true: Include tag into record [Optional: default => false]
-  include_time      (true|false) # true: Include time into record [Optional: default => false]
-  tag_time_name     record_time  # record tag for time when include_time sets true. [Optional: default => 'time']
-  type              (https|amqps) # Connection type. [Optional: default => https]. Note that amqps is not implementated.
-  expiry_interval   <Integer number> # Signature expiration time interval in seconds. [Optional: default => 3600 (60min)]
-  proxy_addr       <Host or IP> # Address of the proxy [Optional]
-  proxy_port	   <Integer>   # Proxy port. [Optional: default => 3128]
-  read_timeout     <Integer>   # HTTP Read timeout in seconds[Optional: default => 60]
-  open_timeout     <Integer>   # HTTP Open timeout in seconds[Optional: default => 60]
-</match>
-```
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/fluent-plugin-azureeventhubs/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+# Fluent::Plugin::Azureeventhubs
+
+Azure Event Hubs buffered output plugin for Fluentd.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'fluent-plugin-azureeventhubs'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install fluent-plugin-azureeventhubs
+
+## Configuration
+
+```
+<match pattern>
+  type azureeventhubs_buffered
+
+  connection_string <Paste SAS connection string from Azure Management Potal>
+  hub_name          <Name of Event Hubs>
+  include_tag       (true|false) # true: Include tag into record [Optional: default => false]
+  include_time      (true|false) # true: Include time into record [Optional: default => false]
+  tag_time_name     record_time  # record tag for time when include_time sets true. [Optional: default => 'time']
+  type              (https|amqps) # Connection type. [Optional: default => https]. Note that amqps is not implementated.
+  expiry_interval   <Integer number> # Signature expiration time interval in seconds. [Optional: default => 3600 (60min)]
+  proxy_addr       <Host or IP> # Address of the proxy [Optional]
+  proxy_port	   <Integer>   # Proxy port. [Optional: default => 3128]
+  read_timeout     <Integer>   # HTTP Read timeout in seconds[Optional: default => 60]
+  open_timeout     <Integer>   # HTTP Open timeout in seconds[Optional: default => 60]
+  message_properties <Json Object> # A json object of key/value pairs to add Properties to the events being sent to EventHubs [Optional: default => nil]
+</match>
+```
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/fluent-plugin-azureeventhubs/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/Rakefile

@@ -1,2 +1,2 @@
-require "bundler/gem_tasks"
-
+require "bundler/gem_tasks"
+

data/fluent-plugin-azureeventhubs.gemspec

@@ -1,22 +1,22 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |spec|
-  spec.name          = "fluent-plugin-azureeventhubs"
-  spec.version       = "0.0.4"
-  spec.authors       = ["Hidemasa Togashi"]
-  spec.email         = ["togachiro@gmail.com"]
-  spec.summary       = "Fluentd output plugin for Azure Event Hubs"
-  spec.description   = "Fluentd output plugin for Azure Event Hubs"
-  spec.homepage      = "https://github.com/htgc/fluent-plugin-azureeventhubs"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = "fluent-plugin-azureeventhubs"
+  spec.version       = "0.0.5"
+  spec.authors       = ["Hidemasa Togashi", "Justin Seely"]
+  spec.email         = ["togachiro@gmail.com"]
+  spec.summary       = "Fluentd output plugin for Azure Event Hubs"
+  spec.description   = "Fluentd output plugin for Azure Event Hubs"
+  spec.homepage      = "https://github.com/htgc/fluent-plugin-azureeventhubs"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+end

data/lib/fluent/plugin/azureeventhubs/http.rb

@@ -1,67 +1,74 @@
-
-class AzureEventHubsHttpSender
-  def initialize(connection_string, hub_name, expiry=3600,proxy_addr='',proxy_port=3128,open_timeout=60,read_timeout=60)
-    require 'openssl'
-    require 'base64'
-    require 'net/http'
-    require 'json'
-    require 'cgi'
-    require 'time'
-    @connection_string = connection_string
-    @hub_name = hub_name
-    @expiry_interval = expiry
-    @proxy_addr = proxy_addr
-    @proxy_port = proxy_port
-    @open_timeout = open_timeout
-    @read_timeout = read_timeout
-
-    if @connection_string.count(';') != 2
-      raise "Connection String format is not correct"
-    end
-
-    @connection_string.split(';').each do |part|
-      if ( part.index('Endpoint') == 0 )
-        @endpoint = 'https' + part[11..-1]
-      elsif ( part.index('SharedAccessKeyName') == 0 )
-        @sas_key_name = part[20..-1]
-      elsif ( part.index('SharedAccessKey') == 0 )
-        @sas_key_value = part[16..-1]
-      end
-    end
-    @uri = URI.parse("#{@endpoint}#{@hub_name}/messages")
-  end
-
-  def generate_sas_token(uri)
-    target_uri = CGI.escape(uri.downcase).downcase
-    expiry = Time.now.to_i + @expiry_interval
-    to_sign = "#{target_uri}\n#{expiry}";
-    signature = CGI.escape(Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha256'), @sas_key_value, to_sign)).strip())
-
-    token = "SharedAccessSignature sr=#{target_uri}&sig=#{signature}&se=#{expiry}&skn=#{@sas_key_name}"
-    return token
-  end
-
-  private :generate_sas_token
-
-  def send(payload)
-    token = generate_sas_token(@uri.to_s)
-    headers = {
-      'Content-Type' => 'application/atom+xml;type=entry;charset=utf-8',
-      'Authorization' => token
-    }
-    if (@proxy_addr.to_s.empty?)
-    	https = Net::HTTP.new(@uri.host, @uri.port)
-        https.open_timeout = @open_timeout
-        https.read_timeout = @read_timeout
-    else
-    	https = Net::HTTP.new(@uri.host, @uri.port,@proxy_addr,@proxy_port)
-        https.open_timeout = @open_timeout
-        https.read_timeout = @read_timeout
-    end
-    https.use_ssl = true
-    req = Net::HTTP::Post.new(@uri.request_uri, headers)
-    req.body = payload.to_json
-    res = https.request(req)
-    rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Errno::ETIMEDOUT, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-  end
-end
+
+class AzureEventHubsHttpSender
+  def initialize(connection_string, hub_name, expiry=3600,proxy_addr='',proxy_port=3128,open_timeout=60,read_timeout=60)
+    require 'openssl'
+    require 'base64'
+    require 'net/http'
+    require 'json'
+    require 'cgi'
+    require 'time'
+    @connection_string = connection_string
+    @hub_name = hub_name
+    @expiry_interval = expiry
+    @proxy_addr = proxy_addr
+    @proxy_port = proxy_port
+    @open_timeout = open_timeout
+    @read_timeout = read_timeout
+
+    if @connection_string.count(';') != 2
+      raise "Connection String format is not correct"
+    end
+
+    @connection_string.split(';').each do |part|
+      if ( part.index('Endpoint') == 0 )
+        @endpoint = 'https' + part[11..-1]
+      elsif ( part.index('SharedAccessKeyName') == 0 )
+        @sas_key_name = part[20..-1]
+      elsif ( part.index('SharedAccessKey') == 0 )
+        @sas_key_value = part[16..-1]
+      end
+    end
+    @uri = URI.parse("#{@endpoint}#{@hub_name}/messages")
+  end
+
+  def generate_sas_token(uri)
+    target_uri = CGI.escape(uri.downcase).downcase
+    expiry = Time.now.to_i + @expiry_interval
+    to_sign = "#{target_uri}\n#{expiry}";
+    signature = CGI.escape(Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha256'), @sas_key_value, to_sign)).strip())
+
+    token = "SharedAccessSignature sr=#{target_uri}&sig=#{signature}&se=#{expiry}&skn=#{@sas_key_name}"
+    return token
+  end
+
+  private :generate_sas_token
+
+  def send(payload)
+    send_w_properties(payload, nil)
+  end
+
+  def send_w_properties(payload, properties)
+    token = generate_sas_token(@uri.to_s)
+    headers = {
+      'Content-Type' => 'application/atom+xml;type=entry;charset=utf-8',
+      'Authorization' => token
+    }
+    if not properties.nil?
+      headers = headers.merge(properties)
+    end
+    if (@proxy_addr.to_s.empty?)
+    	https = Net::HTTP.new(@uri.host, @uri.port)
+        https.open_timeout = @open_timeout
+        https.read_timeout = @read_timeout
+    else
+    	https = Net::HTTP.new(@uri.host, @uri.port,@proxy_addr,@proxy_port)
+        https.open_timeout = @open_timeout
+        https.read_timeout = @read_timeout
+    end
+    https.use_ssl = true
+    req = Net::HTTP::Post.new(@uri.request_uri, headers)
+    req.body = payload.to_json
+    res = https.request(req)
+    rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Errno::ETIMEDOUT, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+  end
+end

data/lib/fluent/plugin/out_azureeventhubs_buffered.rb

@@ -1,47 +1,48 @@
-#module Fluent
-
-  class AzureEventHubsOutputBuffered < Fluent::BufferedOutput
-    Fluent::Plugin.register_output('azureeventhubs_buffered', self)
-
-    config_param :connection_string, :string
-    config_param :hub_name, :string
-    config_param :include_tag, :bool, :default => false
-    config_param :include_time, :bool, :default => false
-    config_param :tag_time_name, :string, :default => 'time'
-    config_param :expiry_interval, :integer, :default => 3600 # 60min
-    config_param :type, :string, :default => 'https' # https / amqps (Not Implemented) 
-    config_param :proxy_addr, :string, :default => ''
-    config_param :proxy_port, :integer,:default => 3128
-    config_param :open_timeout, :integer,:default => 60
-    config_param :read_timeout, :integer,:default => 60
-
-    def configure(conf)
-      super
-      case @type
-      when 'amqps'
-        raise NotImplementedError
-      else
-        require_relative 'azureeventhubs/http'
-        @sender = AzureEventHubsHttpSender.new(@connection_string, @hub_name, @expiry_interval,@proxy_addr,@proxy_port,@open_timeout,@read_timeout)
-      end
-    end
-
-    def format(tag, time, record)
-      [tag, time, record].to_msgpack
-    end
-
-    def write(chunk)
-      chunk.msgpack_each { |tag, time, record|
-        p record.to_s
-        if @include_tag
-          record['tag'] = tag
-        end
-        if @include_time
-          record[@tag_time_name] = time
-        end
-        @sender.send(record)
-      }
-    end
-  end
-#end
-
+#module Fluent
+
+  class AzureEventHubsOutputBuffered < Fluent::BufferedOutput
+    Fluent::Plugin.register_output('azureeventhubs_buffered', self)
+
+    config_param :connection_string, :string
+    config_param :hub_name, :string
+    config_param :include_tag, :bool, :default => false
+    config_param :include_time, :bool, :default => false
+    config_param :tag_time_name, :string, :default => 'time'
+    config_param :expiry_interval, :integer, :default => 3600 # 60min
+    config_param :type, :string, :default => 'https' # https / amqps (Not Implemented) 
+    config_param :proxy_addr, :string, :default => ''
+    config_param :proxy_port, :integer,:default => 3128
+    config_param :open_timeout, :integer,:default => 60
+    config_param :read_timeout, :integer,:default => 60
+    config_param :message_properties, :hash, :default => nil
+
+    def configure(conf)
+      super
+      case @type
+      when 'amqps'
+        raise NotImplementedError
+      else
+        require_relative 'azureeventhubs/http'
+        @sender = AzureEventHubsHttpSender.new(@connection_string, @hub_name, @expiry_interval,@proxy_addr,@proxy_port,@open_timeout,@read_timeout)
+      end
+    end
+
+    def format(tag, time, record)
+      [tag, time, record].to_msgpack
+    end
+
+    def write(chunk)
+      chunk.msgpack_each { |tag, time, record|
+        p record.to_s
+        if @include_tag
+          record['tag'] = tag
+        end
+        if @include_time
+          record[@tag_time_name] = time
+        end
+        @sender.send_w_properties(record, @message_properties)
+      }
+    end
+  end
+#end
+

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azureeventhubs
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Hidemasa Togashi
+- Justin Seely
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin for Azure Event Hubs