fluent-plugin-azurefunctions 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3110c479872af4941bd94a6cc65507068811b37b
-  data.tar.gz: 2c14ca72f3d95508f90828c2cf1a3c44c0e4e88e
+  metadata.gz: 83eccba4bb49d6569a791d111c80e6a74d61e565
+  data.tar.gz: 5c1d87ecc87033efbc85f4e57d30636a6e540fd5
 SHA512:
-  metadata.gz: bc157e69274bd27a395cacffc9a3f219926eab95dd774b5229f3db171cfddc28120f32861d999d1f1d773ff424d34dce22fef6377c4b7599f822aa8df6431035
-  data.tar.gz: 08540d4ccfcc4e694d81da6337ea4a5d9799e646b51a4a6b5c2c85623a1da44ad9f0e69a2d13df983cb0677f6428509a3aa56330ec2809ad9dbfe7e0b68466ca
+  metadata.gz: ca82ecfd1960a970ad8a6a7e96c2474035bf66abfc75b36d85e281299905d354f2d486607e28c3aaad77a04b04885836c22170b6dc8525a51d39249bead89848
+  data.tar.gz: 73886b67f142ab5aa8bb47ffa84259d3fd23c930c71d6abf9b8e6a20da1222c54eecf4220364177ad74bad765622c229c935186bd441cf04404622b0cc86eea7

data/ChangeLog.md

@@ -1,3 +1,8 @@
+## 0.2.0
+
+* Migrate to use fluentd v0.14 API - [PR#2](https://github.com/yokawasa/fluent-plugin-azurefunctions/pull/2)
+* Support plugin specific log level - [PR#1](https://github.com/yokawasa/fluent-plugin-azurefunctions/pull/1)
+
 ## 0.1.1
 
 * Changed Azure functions API key authorization from simply adding it to query string as code param to including it to x-functions-key HTTP header

data/README.md

@@ -4,6 +4,13 @@
 ![fluent-plugin-azurefunctions overview](https://github.com/yokawasa/fluent-plugin-azurefunctions/raw/master/img/Azure-Functions-Fluentd.png)
 
 
+## Requirements
+
+| fluent-plugin-documentdb | fluentd | ruby |
+|------------------------|---------|------|
+| >= 0.2.0 | >= v0.14.15 | >= 2.1 |
+|  < 0.2.0 | >= v0.12.0 | >= 1.9 |
+
 ## Installation
 ```
 $ gem install fluent-plugin-azurefunctions
@@ -30,6 +37,7 @@ examples/function-csharp
 ```
 <match azurefunctions.**>
     @type azurefunctions
+    @log_level info
     endpoint  AZURE_FUNCTION_ENDPOINT   # ex. https://<accountname>.azurewebsites.net/api/<functionname>
     function_key AZURE_FUNCTION_KEY     # ex. aRVQ7Lj0vzDhY0JBYF8gpxYyEBxLwhO51JSC7X5dZFbTvROs7uNg==
     key_names key1,key2,key3
@@ -52,6 +60,7 @@ examples/function-csharp
  * **add\_tag\_field (optional)** - Default:false. This option allows to insert a tag field to record
  * **tag\_field\_name (optional)** - Default:tag. This is required only when add_time_field is true
 
+[note] @log_level is a fluentd built-in parameter (optional) that controls verbosity of logging: fatal|error|warn|info|debug|trace (See also [Logging of Fluentd](http://docs.fluentd.org/articles/logging#log-level))
 
 ## Configuration examples
 
@@ -81,10 +90,6 @@ echo ' { "key1":"value1", "key2":"value2", "key3":"value3"}' | fluent-cat azuref
 {
     "payload": '{"key1":"value1", "key2":"value2", "key3":"value3", "time":"1479741633"}'
 }
-
-mytime=1479741633
-
-
 ```
 
 
@@ -151,6 +156,7 @@ $ echo ' { "key1":"value1", "key2":"value2", "key3":"value3"}' | fluent-cat azur
 
 ## Links
 
+* https://yokawasa.github.io/fluent-plugin-azurefunctions
 * https://rubygems.org/gems/fluent-plugin-azurefunctions
 * http://unofficialism.info/posts/fluent-plugin-azurefunctions/
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/fluent-plugin-azurefunctions.gemspec

@@ -18,10 +18,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|gem|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]
+  gem.add_dependency "fluentd", [">= 0.14.15", "< 2"]
   gem.add_dependency "rest-client"
   gem.add_development_dependency "bundler", "~> 1.11"
   gem.add_development_dependency "rake", "~> 10.0"
   gem.add_development_dependency "test-unit"
 end
-

data/lib/fluent/plugin/out_azurefunctions.rb

@@ -1,15 +1,17 @@
 # -*- coding: utf-8 -*-
 
-module Fluent
-  class AzureFunctionsOutput < BufferedOutput
-    Plugin.register_output('azurefunctions', self)
+require 'fluent/plugin/output'
+require 'msgpack'
+require 'time'
+require 'fluent/plugin/azurefunctions/client'
 
-    def initialize
-      super
-      require 'msgpack'
-      require 'time'
-      require 'fluent/plugin/azurefunctions/client'
-    end
+module Fluent::Plugin
+  class AzureFunctionsOutput < Output
+    Fluent::Plugin.register_output('azurefunctions', self)
+
+    helpers :compat_parameters
+
+    DEFAULT_BUFFER_TYPE = "memory"
 
     config_param :endpoint, :string,
                  :desc => "Azure Functions Endpoint URL"
@@ -30,20 +32,25 @@ module Fluent
     config_param :tag_field_name, :string, :default => "tag",
                  :desc => "This is required only when add_time_field is true"
 
+    config_section :buffer do
+      config_set_default :@type, DEFAULT_BUFFER_TYPE
+    end
+
     def configure(conf)
+      compat_parameters_convert(conf, :buffer)
       super
-      raise ConfigError, 'no endpoint' if @endpoint.empty?
-      raise ConfigError, 'no function_key' if @function_key.empty?
+      raise Fluent::ConfigError, 'no endpoint' if @endpoint.empty?
+      raise Fluent::ConfigError, 'no function_key' if @function_key.empty?
       if not @key_names.nil?
         @key_names = @key_names.split(',')
       end
       if @add_time_field and @time_field_name.empty?
-        raise ConfigError, 'time_field_name must be set if add_time_field is true'
+        raise Fluent::ConfigError, 'time_field_name must be set if add_time_field is true'
       end
       if @add_tag_field and @tag_field_name.empty?
-        raise ConfigError, 'tag_field_name must be set if add_tag_field is true'
+        raise Fluent::ConfigError, 'tag_field_name must be set if add_tag_field is true'
       end
-      @timef = TimeFormatter.new(@time_format, @localtime)
+      @timef = Fluent::TimeFormatter.new(@time_format, @localtime)
     end
 
     def start
@@ -86,6 +93,14 @@ module Fluent
       record.to_msgpack
     end
 
+    def formatted_to_msgpack_binary?
+      true
+    end
+
+    def multi_workers_ready?
+      true
+    end
+
     def write(chunk)
       chunk.msgpack_each { |record|
         payload = JSON.dump(record)
@@ -95,7 +110,7 @@ module Fluent
         begin
           @client.post(payload)
         rescue Exception => ex
-          $log.fatal "Error occured in posting to Azure Functions HTTP trigger function: " 
+          log.fatal "Error occured in posting to Azure Functions HTTP trigger function: "
                   + "'#{ex}', .rid=>#{unique_identifier}, payload=>" + payload
         end
       }

data/test/helper.rb

@@ -23,7 +23,10 @@ unless ENV.has_key?('VERBOSE')
   $log = nulllogger
 end
 
+require 'fluent/test/driver/output'
+require 'fluent/test/helpers'
 require 'fluent/plugin/out_azurefunctions'
 
 class Test::Unit::TestCase
+  include Fluent::Test::Helpers
 end

data/test/plugin/test_azurefunctions.rb

@@ -20,69 +20,77 @@ class AzureFunctionsOutputTest < Test::Unit::TestCase
   #   utc
   # ]
 
-  def create_driver(conf = CONFIG, tag='azurefunctions.test')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::AzureFunctionsOutput, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::AzureFunctionsOutput).configure(conf)
   end
 
   def test_configure
-    #### set configurations
-    # d = create_driver %[
-    #   path test_path
-    #   compress gz
-    # ]
-    #### check configurations
-    # assert_equal 'test_path', d.instance.path
-    # assert_equal :gz, d.instance.compress
+    d = create_driver
+
+    assert_equal 'https://yoichikademo1.azurewebsites.net/api/HttpTriggerFunction',
+                 d.instance.endpoint
+    assert_equal 'aRVQ7Lj0vzDhY0JBYF8gpDzDCyEBxLwhO51JSC7X5dZFbTvROs7uNg==',
+                 d.instance.function_key
+    assert_equal ["postid", "user", "content", "tag"], d.instance.key_names
+    assert_true d.instance.localtime
+    assert_true d.instance.add_time_field
+    assert_equal 'time', d.instance.time_field_name
+    assert_true d.instance.add_tag_field
+    assert_equal 'tag', d.instance.tag_field_name
   end
 
   def test_format
     d = create_driver
 
-    # time = Time.parse("2011-01-02 13:14:15 UTC").to_i
-    # d.emit({"a"=>1}, time)
-    # d.emit({"a"=>2}, time)
-
-    # d.expect_format %[2011-01-02T13:14:15Z\ttest\t{"a":1}\n]
-    # d.expect_format %[2011-01-02T13:14:15Z\ttest\t{"a":2}\n]
+    time = event_time("2011-01-02 13:14:15 UTC")
+    d.run(default_tag: 'documentdb.test') do
+      d.feed(time, {"a"=>1})
+      d.feed(time, {"a"=>2})
+    end
 
-    # d.run
+    # assert_equal EXPECTED1, d.formatted[0]
+    # assert_equal EXPECTED2, d.formatted[1]
   end
 
   def test_write
     d = create_driver
 
-    time = Time.parse("2016-01-28 13:14:15 UTC").to_i
-    d.emit(
-        {
-            "postid" => "10001",
-            "user"=> "ladygaga",
-            "content" => "post by ladygaga",
-            "tag" => "azurefunctions.debug",
-            "posttime" =>"2016-11-31T00:00:00Z"
-        }, time)
+    time = event_time("2016-01-28 13:14:15 UTC")
+    data = d.run(default_tag: 'azurefunctions.test') do
+      d.feed(
+          time,
+          {
+              "postid" => "10001",
+              "user"=> "ladygaga",
+              "content" => "post by ladygaga",
+              "tag" => "azurefunctions.debug",
+              "posttime" =>"2016-11-31T00:00:00Z"
+          })
 
-    d.emit(
-        {
-            "postid" => "10002",
-            "user"=> "katyperry",
-            "content" => "post by katyperry",
-            "tag" => "azurefunctions.debug",
-            "posttime" =>"2016-11-31T00:00:00Z"
-        }, time)
+      d.feed(
+          time,
+          {
+              "postid" => "10002",
+              "user"=> "katyperry",
+              "content" => "post by katyperry",
+              "tag" => "azurefunctions.debug",
+              "posttime" =>"2016-11-31T00:00:00Z"
+          })
 
-    d.emit(
-        {
-            "postid" => "10003",
-            "tag" => "azurefunctions.debug",
-            "time" =>"2016-11-31T00:00:00Z"
-        }, time)
+      d.feed(
+          time,
+          {
+              "postid" => "10003",
+              "tag" => "azurefunctions.debug",
+              "time" =>"2016-11-31T00:00:00Z"
+          })
 
-    d.emit(
-        {
-            "posttime" => "2016-11-31T00:00:00Z"
-        }, time)
-
-    data = d.run
+      d.feed(
+          time,
+          {
+              "posttime" => "2016-11-31T00:00:00Z"
+          })
+    end
     puts data
     # ### FileOutput#write returns path
     # path = d.run
@@ -90,4 +98,3 @@ class AzureFunctionsOutputTest < Test::Unit::TestCase
     # assert_equal expect_path, path
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azurefunctions
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Yoichi Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.58
+        version: 0.14.15
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.58
+        version: 0.14.15
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'