fluent-plugin-metricsense 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6430d058a31cc5069917ff310898b8e8cfc05b6e
-  data.tar.gz: 312a17043422d6acd5f159b67784a5ab7825d024
+  metadata.gz: 87384bad8d55efdb43f5f68b3d66bcfdce31a003
+  data.tar.gz: 2efa753e4a092052ff567fd014d8004804cd5b1e
 SHA512:
-  metadata.gz: 216fb1a2b7e72ac5236244bbecf7143ffc4ef2151e4796f7f95293de70c8c1476cc52978e31afb560d68b3d706c492a1cb0528c2218fca49344eab5f2ee7619b
-  data.tar.gz: d90f34a0ff17b574205d81aba56561e1eaac9bb14f4014ed7cfff5d8fea15fc0087d22c7476b620686e1b539fcdc40a02ff5184bd6fc54a7411acb58a966b72f
+  metadata.gz: 99f6c382071ca9e4d26fefa8c3227d5558718750b6287c2eed7102e96c53aad1a6367271dc85d21aaf2b8f5b14773f0fbb90ade4eea4e4074d8263f90551e890
+  data.tar.gz: 0a42690cde3a828784025d0bbc914a4f23b8ac7ef0ff93bfc3ef4375651a5cac6953d988b0346f4d84360a5e2b0cba1d57eeac1c9c89b932defc10e14c126ffe

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/fluent/plugin/backends/librato_backend.rb

@@ -26,6 +26,7 @@ module Fluent::MetricSenseOutput::Backends
 
     config_param :librato_user, :string
     config_param :librato_token, :string
+    config_param :batch_size, :integer, :default => 200
 
     def initialize
       super
@@ -43,7 +44,7 @@ module Fluent::MetricSenseOutput::Backends
 
       begin
         # send upto 50 entries at once
-        data.each_slice(50) {|slice|
+        data.each_slice(@batch_size) {|slice|
           req = Net::HTTP::Post.new('/v1/metrics', header)
           req.basic_auth @librato_user, @librato_token
 
@@ -67,14 +68,14 @@ module Fluent::MetricSenseOutput::Backends
           }
           body = {"gauges"=>data}.to_json
 
-          $log.trace { "librato metrics: #{data.inspect}" }
+          log.trace { "librato metrics: #{data.inspect}" }
           req.body = body
           req.set_content_type("application/json")
           res = http.request(req)
 
           # TODO error handling
           if res.code != "200"
-            $log.warn "librato_metrics: #{res.code}: #{res.body}"
+            log.warn "librato_metrics: #{res.code}: #{res.body}"
           end
         }
 
@@ -117,14 +118,14 @@ module Fluent::MetricSenseOutput::Backends
       req = Net::HTTP::Put.new("/v1/metrics/#{CGI.escape name}", header)
       req.basic_auth @librato_user, @librato_token
 
-      $log.trace { "librato initialize metric with mode #{mode}: #{name}" }
+      log.trace { "librato initialize metric with mode #{mode}: #{name}" }
       req.body = METRIC_INITIALIZE_REQUEST_PER_MODE[mode]
       req.set_content_type("application/json")
       res = http.request(req)
 
       # TODO error handling
       if res.code !~ /20./
-        $log.warn "librato_metrics: #{res.code}: #{res.body}"
+        log.warn "librato_metrics: #{res.code}: #{res.body}"
       else
         @initialized_metrics[name] = true
       end

data/lib/fluent/plugin/out_metricsense.rb

@@ -36,6 +36,9 @@ module Fluent
     class Backend
       UpdateMode = MetricSenseOutput::UpdateMode
       include Configurable
+
+      attr_accessor :log
+
       def start
       end
       def shutdown
@@ -64,6 +67,10 @@ module Fluent
 
     config_param :aggregate_interval, :time, :default => 60
 
+    unless method_defined?(:log)
+      define_method(:log) { $log }
+    end
+
     def configure(conf)
       super
 
@@ -92,6 +99,7 @@ module Fluent
       @normalize_factor = @aggregate_interval / 60
 
       @backend = be.new
+      @backend.log = log
       @backend.configure(conf)
     end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-metricsense
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
 description: MetricSense - application metrics aggregation plugin for Fluentd
@@ -72,7 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -91,17 +91,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MetricSense - application metrics aggregation plugin for Fluentd