fluent-plugin-mackerel 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cdc01b9ed1b88271cdb43f047f2ee5d6c99d202
-  data.tar.gz: 37f679989f7833d96030e0d3318c373699814ee4
+  metadata.gz: fba2647b6e58433c48d7f479da35206aa0f0ef4e
+  data.tar.gz: d775a6c6c53739eb1e3503968b5780de18773133
 SHA512:
-  metadata.gz: a05ea65c41a6aece83247c6b1726e531227e42b78642855427f5f693cbc1491e0fef228e50b3ecb8f6966ffcb806d1f824b01a2e2b8e1573841e3d437ad5f8b6
-  data.tar.gz: ba513b40e4347e0e0e0f4a63479f28c69e183e5f86118a7299d13fdee0c7af5073108492e5673a87e02086b5b62cb7e060ecfa9dfefdd6d267d1e3c7917b17b2
+  metadata.gz: 6ce5fea01ec17d19e7587a8ec46f116827f27ab1ecb7d7eca5cd2b9cdf72a09b741e4f902e7c3af6327e8e8f5b9f21318a169bf4eb1ea9b1e1bdc6d7c20c69b3
+  data.tar.gz: ad0c53ceaf70db022eb3a5cea4b2ccd5fbdb2c5797d145f4568992fc8cf0a94a93e36b4c04f84b671a78395e323815d82cd538750277f2c514b8742f696c76c8

data/README.md

@@ -1,4 +1,4 @@
-# fluent-plugin-mackerel [![Build Status](https://travis-ci.org/tksmd/fluent-plugin-mackerel.png?branch=master)](https://travis-ci.org/tksmd/fluent-plugin-mackerel)
+# fluent-plugin-mackerel [![Build Status](https://travis-ci.org/mackerelio/fluent-plugin-mackerel.png?branch=master)](https://travis-ci.org/mackerelio/fluent-plugin-mackerel)
 
 ## Overview
 
@@ -29,6 +29,7 @@ This plugin uses [APIv0](http://help-ja.mackerel.io/entry/spec/api/v0) of macker
   api_key 123456
   hostid xyz
   metrics_name http_status.${out_key}
+  use_zero_for_empty
   out_keys 2xx_count,3xx_count,4xx_count,5xx_count
 </match>
 ```
@@ -44,6 +45,9 @@ Then the sent metric data will look like this:
 ```
 As shown above, `${out_key}` will be replaced with out_key like "2xx_count" when sending metrics.
 
+In the case some outkeys do not have any value, the value will be set to `0` with `use_zero_for_empty`, the default of which is true.
+For example, you set `out_keys 2xx_count,3xx_count,4xx_count,5xx_count`, but you only get `2xx_count`, `3xx_count` and `4xx_count`, then `5xx_count` will be set to `0` with `use_zero_for_empty`.
+
 You can use `out_key_pattern` instead of `out_keys`. Input records whose key matches the pattern set to `out_key_pattern` will be sent. Either `out_keys` or `out_key_pattern` is required.
 
 ```

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.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["tksmd","hatz48","stanaka","Songmu"]
   spec.email         = ["developers@mackerel.io"]
   spec.description   = %q{fluent plugin to send metrics to mackerel.io}

data/lib/fluent/plugin/out_mackerel.rb

@@ -13,6 +13,7 @@ module Fluent
     config_param :out_keys, :string, :default => nil
     config_param :out_key_pattern, :string, :default => nil
     config_param :origin, :string, :default => nil
+    config_param :use_zero_for_empty, :bool, :default => true
 
     MAX_BUFFER_CHUNK_LIMIT = 100 * 1024
     config_set_default :buffer_chunk_limit, MAX_BUFFER_CHUNK_LIMIT
@@ -101,10 +102,26 @@ module Fluent
       [tag, time, record].to_msgpack
     end
 
+    def generate_metric(key, tokens, time, value)
+      name = @name_processor.nil? ? key :
+               @name_processor.map{ |p| p.call(:out_key => key, :tokens => tokens) }.join('.')
+
+      metric = {
+        'value' => value,
+        'time' => time,
+        'name' => @remove_prefix ? name : "%s.%s" % ['custom', name]
+      }
+      metric['hostId'] = @hostid_processor.call(:tokens => tokens) if @hostid
+      return metric
+    end
+
     def write(chunk)
       metrics = []
+      processed = {}
+      tags = {}
+      time_latest = 0
       chunk.msgpack_each do |(tag,time,record)|
-
+        tags[tag] = true
         tokens = tag.split('.')
 
         if @out_keys
@@ -114,16 +131,20 @@ module Fluent
         end
 
         out_keys.map do |key|
-          name = @name_processor.nil? ? key :
-            @name_processor.map{ |p| p.call(:out_key => key, :tokens => tokens) }.join('.')
+          metrics << generate_metric(key, tokens, time, record[key].to_f)
+          time_latest = time if time_latest == 0 || time_latest < time
+          processed[tag + "." + key] = true
+        end
+      end
 
-          metric = {
-            'value' => record[key].to_f,
-            'time' => time,
-            'name' => @remove_prefix ? name : "%s.%s" % ['custom', name]
-          }
-          metric['hostId'] = @hostid_processor.call(:tokens => tokens) if @hostid
-          metrics << metric
+      if @out_keys && @use_zero_for_empty
+        tags.each_key do |tag|
+          tokens = tag.split('.')
+          @out_keys.each do |key|
+            unless processed[tag + "." + key]
+              metrics << generate_metric(key, tokens, time_latest, 0.0)
+            end
+          end
         end
       end
 
@@ -132,6 +153,7 @@ module Fluent
     end
 
     def send(metrics)
+      log.debug("out_mackerel: #{metrics}")
       begin
         if @hostid
           @mackerel.post_metrics(metrics)

data/test/plugin/test_out_mackerel.rb

@@ -106,6 +106,14 @@ class MackerelOutputTest < Test::Unit::TestCase
     out_keys val1,val2,val3
   ]
 
+  CONFIG_SERVICE_USE_ZERO = %[
+    type mackerel
+    api_key 123456
+    service xyz
+    use_zero_for_empty
+    out_keys val1,val2,val3
+  ]
+
   def create_driver(conf = CONFIG, tag='test')
     Fluent::Test::BufferedOutputTestDriver.new(Fluent::MackerelOutput, tag).configure(conf)
   end
@@ -231,6 +239,20 @@ end
     d.run()
   end
 
+  def test_service_use_zero
+    d = create_driver(CONFIG_SERVICE_USE_ZERO)
+    mock(d.instance.mackerel).post_service_metrics('xyz', [
+      {"value"=>1.0, "time"=>1399997498, "name"=>"custom.val1"},
+      {"value"=>2.0, "time"=>1399997498, "name"=>"custom.val2"},
+      {"value"=>0.0, "time"=>1399997498, "name"=>"custom.val3"},
+    ])
+
+    ENV["TZ"]="Asia/Tokyo"
+    t = Time.strptime('2014-05-14 01:11:38', '%Y-%m-%d %T')
+    d.emit({'val1' => 1, 'val2' => 2, 'foo' => 3}, t)
+    d.run()
+  end
+
   def test_name_processor
     [
       {metrics_name: "${out_key}", expected: "val1"},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mackerel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - tksmd
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mackerel-client
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: fluent plugin to send metrics to mackerel.io