fluent-plugin-mackerel 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTA0MzM4MTQ2MTk3OTM4ZTUxNzA3YTBiYmFjOGNiZmY2NjI1MDc4MQ==
+    NTY0NzJkZjgzMDMwNzNkNGY1MjdkYmQ5ZTNlNzA2ZTAwZjg2N2I3Nw==
   data.tar.gz: !binary |-
-    NTE3NDRiNDM3MzQ5YTA4MGEzOTIwMmY1NTE1NGE5NzJhOGExNWJjYw==
+    MzAyNDI3MTdlODNlMzhhNGMwMzEyNmJhOTdkODdlYzY0ZDNiOTc0MQ==
 SHA512:
   metadata.gz: !binary |-
-    YmQxN2IyZGY0OGEzODJmMzYzYTgyNzM1MzI3OGI1ZTBiNmRjMGQ4MTY4OGNm
-    N2U0MzE4MjZmMjM2OTJmNzM3MDBiNTAyZDIwYzdiNzJlYzg2OGQzN2NiNTNk
-    ZTZmYjEwMTI5Njk0ZGU3NGZhNmFkN2NhYzYyNGFiNmYzMzEzMDQ=
+    OWU4YzZlM2Q1Zjk5MzY5OGI2ZWVjODUzYWU0YjY3ZmU0M2Y4YjAzMDVkMjRk
+    Yjk5N2U1NzNlNzQwYWI1YjQyNmVmMGM3NzFkM2Q3NDQ3OTg1Y2E3ODYzZDdh
+    MjljZDg0MmU1YWUyNzhkNDJjMDQ2YTkxYmRjNmI0ZTI0YjM1YmY=
   data.tar.gz: !binary |-
-    ODRhN2I4YzhjMmQxMmFjZWFjNTg4NjMzNmViNDQ0N2QwYTNhNTBkNjhkOWUw
-    MmEwZjRiMTJjN2QwMDU4ZWYwYmM0NWQ4Y2Y3NjE4ZTQ0M2ZiM2Y2MGU4MTFl
-    Yjg1NDc0MThkNzQxYzJiM2RjNjQ2YTZlOTI3ODdlOTY3YTEyY2E=
+    OTYwYjM0ZGUwMmRjMzRlMjNjYjg2ODIyMWIwMjc5ZWI0OGNlZTkwZmFjNWEx
+    MjYwZWZjZWRiNjE4Yzc0NTkyZmY0NjhjZjc3YTkyZjU5ODA3NTU1MTI5MmMz
+    YmM1NjFmODBkOGYwMzcwOTY1MWRhZTU5ZTdiNWQ3MTlkNzhiNGI=

data/README.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-[Fluentd](http://fluentd.org) plugin to send metrics to [mackerel](http://mackerel.io/).
+[Fluentd](http://fluentd.org) plugin to send metrics to [mackerel.io](http://mackerel.io/).
 
 ## Installation
 
@@ -40,7 +40,9 @@ Then the sent metric data will look like this:
   "value": 100.0
 }
 ```
-As shown above, metric name will be a concatenation of metrics_prefix and out_keys values.
+As shown above, metric name will be a concatenation of `metrics_prefix` and `out_keys` values.
+
+`flush_interval` is not allowed to set less than 60 secs not to send API requests more than once in a minute.
 
 ## TODO
 

data/fluent-plugin-mackerel.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mackerel"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["tksmd"]
   spec.email         = ["someda@isenshi.com"]
   spec.description   = %q{fluent plugin to send metrics to mackerel.io}

data/lib/fluent/plugin/out_mackerel.rb

@@ -8,8 +8,6 @@ module Fluent
     config_param :metrics_prefix, :string
     config_param :out_keys, :string
 
-    config_param :flush_interval, :time, :default => 1
-
     attr_reader :mackerel
 
     # Define `log` method for v0.10.42 or earlier
@@ -27,6 +25,11 @@ module Fluent
       @mackerel = Mackerel.new(conf['api_key'])
       @out_keys = @out_keys.split(',')
 
+      if @flush_interval < 60
+        log.info("flush_interval less than 60s is not allowed and overwriteen to 60s")
+        @flush_interval = 60
+      end
+
       if @hostid.nil? and @hostid_path.nil?
         raise Fluent::ConfigError, "Either 'hostid' or 'hostid_path' must be specifed."
       end
@@ -63,12 +66,12 @@ module Fluent
       end
 
       begin
-        @mackerel.post_metrics(metrics)
+        @mackerel.post_metrics(metrics) unless metrics.empty?
       rescue => e
         log.error("out_mackerel:", :error_class => e.class, :error => e.message)
       end
+      metrics.clear
     end
-
   end
 
   class Mackerel
@@ -85,6 +88,9 @@ module Fluent
     end
 
     def post_metrics(metrics)
+
+      wait_for_minute
+
       req = Net::HTTP::Post.new('/api/v0/tsdb', initheader = {
         'X-Api-Key' => @api_key,
         'Content-Type' =>'application/json',
@@ -102,6 +108,14 @@ module Fluent
       end
     end
 
+    def wait_for_minute
+      # limit request once per minute
+      wait_secs = @last_posted ? @last_posted + 60 - Time.now.to_i : 0
+      sleep wait_secs if wait_secs > 0
+      @last_posted = Time.now.to_i
+      wait_secs > 0
+    end
+
   end
 
   class MackerelError < RuntimeError; end

data/test/plugin/test_out_mackerel.rb

@@ -21,6 +21,15 @@ class MackerelOutputTest < Test::Unit::TestCase
     out_keys val1,val2,val3
   ]
 
+  CONFIG_SMALL_FLUSH_INTERVAL = %[
+    type mackerel
+    api_key 123456
+    hostid xyz
+    metrics_prefix service
+    out_keys val1,val2,val3
+    flush_interval 1s
+  ]
+
   def create_driver(conf = CONFIG, tag='test')
     Fluent::Test::BufferedOutputTestDriver.new(Fluent::MackerelOutput, tag).configure(conf)
   end
@@ -35,11 +44,15 @@ class MackerelOutputTest < Test::Unit::TestCase
       d = create_driver(CONFIG_NOHOST)
     }
 
+    d = create_driver(CONFIG_SMALL_FLUSH_INTERVAL)
+    assert_equal d.instance.instance_variable_get(:@flush_interval), 60
+
     d = create_driver()
     assert_equal d.instance.instance_variable_get(:@api_key), '123456'
     assert_equal d.instance.instance_variable_get(:@hostid), 'xyz'
     assert_equal d.instance.instance_variable_get(:@metrics_prefix), 'service'
     assert_equal d.instance.instance_variable_get(:@out_keys), ['val1','val2','val3']
+    assert_equal d.instance.instance_variable_get(:@flush_interval), 60
   end
 
   def test_write
@@ -60,5 +73,13 @@ class MackerelOutputTest < Test::Unit::TestCase
     d.run()
   end
 
+  def test_wait_for_minute
+    d = create_driver()
+    mackerel = d.instance.mackerel
+    assert_equal mackerel.wait_for_minute, false
+    assert_equal mackerel.wait_for_minute, true
+    sleep 60
+    assert_equal mackerel.wait_for_minute, false
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mackerel
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - tksmd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler