fluent-plugin-growthforecast 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce309fd9162a5d30d1a24cfaed6c72feb607ecbe
-  data.tar.gz: 649824e492f0132967303c1d0f7400c1bdcab98c
+  metadata.gz: 865e153a44d5b24396037e62f80b811d3e8289a1
+  data.tar.gz: 2482017862d4aa533da0f493c1447e5a7fefac73
 SHA512:
-  metadata.gz: 2301b6ce097f7ff46d55a0e972574a5d8b0ba57f2555be7d575bc936b40cfa8f2c394e3d6c2196c3dc77c97339a3cf90c5dbbe8f60fc1d959ed52e393c6e9f72
-  data.tar.gz: 16de04d7a45a0810db0da6de6bb521082899cf488808baa60aa8cd1af2d20ba3693c57191b2bfc77170b82572d4d5357b6991a93a0a07768b09a32e5999bcdf6
+  metadata.gz: c4be0e7f1b76d4edfc035b01f1d50aceef0a79890a715cd034b7a4bfef9497494f97db137a6795dd24eee73aefdf275077c714d4637322aa9f8f21893c5de8ea
+  data.tar.gz: 6cadc77b0cb9c0611b106b0aa27d74a9d45974394bb269c0d1afa3cd7651b22e7caa8abbbd234403ba5060ef6c98dc65f999d4f5eb1a9d2ff600cd58d4085002

data/README.md

@@ -168,6 +168,12 @@ Version v0.2.0 or later, this plugin uses HTTP connection keep-alive for a batch
 
     The password for authentication.
 
+* enable\_float\_number
+
+    Post a floating number rather than an interger number. Default is false. 
+    
+    NOTE: You need to run your GrowthForecast with `--enable-float-number` option, supported by GrowthForecast v0.70 or later.
+        
 ## TODO
 
 * patches welcome!

data/fluent-plugin-growthforecast.gemspec

@@ -2,12 +2,13 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-growthforecast"
-  gem.version       = "0.2.3"
+  gem.version       = "0.2.4"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.summary       = %q{Fluentd output plugin to post numbers to GrowthForecast (by kazeburo)}
   gem.description   = %q{For GrowthForecast, see http://kazeburo.github.com/GrowthForecast/}
   gem.homepage      = "https://github.com/tagomoris/fluent-plugin-growthforecast"
+  gem.license       = "APLv2"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fluent/plugin/out_growthforecast.rb

@@ -29,6 +29,7 @@ class Fluent::GrowthForecastOutput < Fluent::Output
   config_param :timeout, :integer, :default => nil # default 60secs
   config_param :retry, :bool, :default => true
   config_param :keepalive, :bool, :default => true
+  config_param :enable_float_number, :bool, :default => false
 
   config_param :authentication, :string, :default => nil # nil or 'none' or 'basic'
   config_param :username, :string, :default => ''
@@ -132,7 +133,7 @@ class Fluent::GrowthForecastOutput < Fluent::Output
       begin
         post_events(events) if events.size > 0
       rescue => e
-        $log.warn "HTTP POST Error occures to growthforecast server", :error_class => e.class, :error => e.message
+        $log.warn "HTTP POST in background Error occures to growthforecast server", :error_class => e.class, :error => e.message
       end
     end
   end
@@ -185,7 +186,8 @@ class Fluent::GrowthForecastOutput < Fluent::Output
     if @keepalive
       req['Connection'] = 'Keep-Alive'
     end
-    req.set_form_data({'number' => value.to_i, 'mode' => @mode.to_s})
+    value = @enable_float_number ? value.to_f : value.to_i
+    req.set_form_data({'number' => value, 'mode' => @mode.to_s})
     req
   end
 
@@ -199,7 +201,7 @@ class Fluent::GrowthForecastOutput < Fluent::Output
       res = http.start {|http| http.request(req) }
     rescue IOError, EOFError, SystemCallError
       # server didn't respond
-      $log.warn "Net::HTTP.post_form raises exception: #{$!.class}, '#{$!.message}'"
+      $log.warn "net/http POST raises exception: #{$!.class}, '#{$!.message}'"
     end
     unless res and res.is_a?(Net::HTTPSuccess)
       $log.warn "failed to post to growthforecast: #{url}, number: #{value}, code: #{res && res.code}"
@@ -224,7 +226,7 @@ class Fluent::GrowthForecastOutput < Fluent::Output
         end
       end
     rescue IOError, EOFError, SystemCallError
-      $log.warn "Net::HTTP.post_form raises exception: #{$!.class}, '#{$!.message}'"
+      $log.warn "net/http keepalive POST raises exception: #{$!.class}, '#{$!.message}'"
     end
   end
 

data/test/plugin/test_out_growthforecast.rb

@@ -103,6 +103,15 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
       tag_for   name_prefix
   ]
 
+  CONFIG_ENABLE_FLOAT_NUMBER = %[
+      gfapi_url http://127.0.0.1:5125/api/
+      service   service
+      section   metrics
+      name_keys field1,field2,otherfield
+      tag_for   name_prefix
+      enable_float_number true
+  ]
+
   def create_driver(conf=CONFIG1, tag='test.metrics')
     Fluent::Test::OutputTestDriver.new(Fluent::GrowthForecastOutput, tag).configure(conf)
   end
@@ -472,12 +481,47 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
     assert_equal 'test.metrics_othergraph', v3rd[:name]
   end
 
+  # CONFIG_NON_KEEPALIVE = %[
+  #     gfapi_url http://127.0.0.1:5125/api/
+  #     service   service
+  #     section   metrics
+  #     name_keys field1,field2,otherfield
+  #     tag_for   name_prefix
+  #     enable_float_number true
+  # ]
+  def test_enable_float_number
+    @enable_float_number = true # enable float number of dummy server
+
+    d = create_driver(CONFIG_ENABLE_FLOAT_NUMBER, 'test.metrics')
+    d.emit({ 'field1' => 50.5, 'field2' => -20.1, 'field3' => 10, 'otherfield' => 1 })
+    d.run
+
+    assert_equal 3, @posted.size
+    v1st = @posted[0]
+    v2nd = @posted[1]
+    v3rd = @posted[2]
+
+    assert_equal 50.5, v1st[:data][:number]
+    assert_equal 'gauge', v1st[:data][:mode]
+    assert_nil v1st[:auth]
+    assert_equal 'service', v1st[:service]
+    assert_equal 'metrics', v1st[:section]
+    assert_equal 'test.metrics_field1', v1st[:name]
+
+    assert_equal -20.1, v2nd[:data][:number]
+    assert_equal 'test.metrics_field2', v2nd[:name]
+
+    assert_equal 1, v3rd[:data][:number]
+    assert_equal 'test.metrics_otherfield', v3rd[:name]
+  end
+
   # setup / teardown for servers
   def setup
     Fluent::Test.setup
     @posted = []
     @prohibited = 0
     @auth = false
+    @enable_float_number = false
     @dummy_server_thread = Thread.new do
       srv = if ENV['VERBOSE']
               WEBrick::HTTPServer.new({:BindAddress => '127.0.0.1', :Port => GF_TEST_LISTEN_PORT})
@@ -508,12 +552,13 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
           graph_name = $3
           post_param = Hash[*(req.body.split('&').map{|kv|kv.split('=')}.flatten)]
 
+          number = @enable_float_number ? post_param['number'].to_f : post_param['number'].to_i
           @posted.push({
               :service => service,
               :section => section,
               :name => graph_name,
               :auth => nil,
-              :data => { :number => post_param['number'].to_i, :mode => post_param['mode'] },
+              :data => { :number => number, :mode => post_param['mode'] },
             })
 
           res.status = 200

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-growthforecast
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,7 +86,8 @@ files:
 - test/helper.rb
 - test/plugin/test_out_growthforecast.rb
 homepage: https://github.com/tagomoris/fluent-plugin-growthforecast
-licenses: []
+licenses:
+- APLv2
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -111,3 +112,4 @@ summary: Fluentd output plugin to post numbers to GrowthForecast (by kazeburo)
 test_files:
 - test/helper.rb
 - test/plugin/test_out_growthforecast.rb
+has_rdoc: