fluent-plugin-mackerel 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmUyN2IyOTAzYjEwYTBmZGViNzkzYWEzYzY0MjMwNjE1MTE1OTFkNw==
+    MTczNjMxMzUzMzlmYjc4YjlhMjFkYzQ3MzEzN2Y0Y2Q5OGEzYWM0OA==
   data.tar.gz: !binary |-
-    NTVlZTE0ZDc3N2M0OWY2YTE2ZWE4ZDhjYzU2ZTJkN2RjMzllMmYxOQ==
+    MDc2YjNmMzViNWZlZGE0MzA2ZDUyZmQ4YjdkYzA3OWFjZWY0MTE2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NGQ1ODE0MjRmZGMzNDlkNmU4YmZhY2RmN2IwYzQ2MDYwNWMyOWY1NGYwZTY4
-    NTA5YTc1N2I3NDBhNjU1NGJlODJlODg2ZWNjYTdmNDhhNjIzMjg2ZGI0YThk
-    Y2FjMWEyNzVkNDZkOThlN2RiNzQ5MDM5ZTA1MjUxNDk4N2I2ZWU=
+    YTFiZjQ0OGIzZTA3NjUzYzllYTQzYzU2MmIyYWVkNTUwNzE4NWUzZjYyMjcw
+    M2QzZDdhNDQ1NzJkYjBjZGMxZGFjMTFlMTVhMDRkYWFmZGFmMWE2YTZhMDhh
+    NTg0NDIyOTg0NjQ3OWMxOGFlZjc3MTA1M2YzZTMxZThmM2QyOTA=
   data.tar.gz: !binary |-
-    OWNjZWZlNjYzZjdmMDBjMWM0MWM2NzJjMWVhNTYwZDMxZTM4YTc4Y2FmZTk0
-    MTNlYWNjMTFiOWI1YjIyNGUzZjMwYWNiOTQ2NWI2MGMwM2EyODkyYTk3ZDdj
-    YTc5OTk2YjFhMTFhNDBhMDg2Yjk0MjM4Y2Y5ODZiZTZlZjg3Nzc=
+    MjdjODdjMTc5ODIyNGE3M2VhYmI4YmU4YTlhMDM0MGRmNjI3ZmYzZmJjZDNk
+    MzlhODc0MGZmYjk4MGVjZTMxM2M1YjM4NTIwNTk5ZDRkOGZmOGI1ODA1MmY3
+    YjNkZDQzZTI2Y2FkNGVmN2RhMzMzNDU5MDIzNWRhZDc1MDZhNTQ=

data/README.md

@@ -42,7 +42,30 @@ Then the sent metric data will look like this:
   "value": 100.0
 }
 ```
-As shown above, metric name will be a concatenation of `metrics_name` and `out_keys` values when you use ${out_key} in metrics_name definition. In addition, "custom" will be appended before sending metrics to mackerel automatically.
+As shown above, `${out_key}` will be replaced with out_key like "2xx_count" when sending metrics.
+
+You can use `${[n]}` for `mackerel_name` where `n` represents any decimal number including negative value,
+
+```
+<match mackerel.*>
+  type mackerel
+  api_key 123456
+  hostid xyz
+  metrics_name ${[1]}.${out_key}
+  out_keys 2xx_count,3xx_count,4xx_count,5xx_count
+</match>
+```
+
+then it indicates value of the `n` th index of the array got by splitting the tag by `.` (dot) and get the following output when the tag is `mackerel.http_status`.
+```
+{
+  "hostId": "xyz",
+  "name": "custom.http_status.2xx_count",
+  "time": 1399997498,
+  "value": 100.0
+}
+```
+"custom" will be appended to the `name` attribute before sending metrics to mackerel automatically.
 
 You can also send ["service" metric](http://help-ja.mackerel.io/entry/spec/api/v0#service-metric-value-post) as follows.
 ```
@@ -54,7 +77,7 @@ You can also send ["service" metric](http://help-ja.mackerel.io/entry/spec/api/v
   out_keys 2xx_count,3xx_count,4xx_count,5xx_count
 </match>
 ```
-`flush_interval` is not allowed to set less than 60 secs not to send API requests more than once in a minute.
+`flush_interval` is not allowed to be set less than 60 secs not to send API requests more than once in a minute.
 
 Since version 0.0.4, metrics_prefix was removed and you should use metrics_name instead.
 

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.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["tksmd","hatz48"]
   spec.email         = ["someda@isenshi.com"]
   spec.description   = %q{fluent plugin to send metrics to mackerel.io}

data/lib/fluent/plugin/out_mackerel.rb

@@ -89,6 +89,9 @@ module Fluent
 
         tokens = tag.split('.')
         out_keys.map do |key|
+
+          next unless record.has_key?(key)
+
           name = @name_processor.nil? ? key :
             @name_processor.map{ |p| p.call(:out_key => key, :tokens => tokens) }.join('.')
 

data/test/plugin/test_out_mackerel.rb

@@ -68,19 +68,22 @@ class MackerelOutputTest < Test::Unit::TestCase
 
   def test_write
     d = create_driver()
-    stub(d.instance.mackerel).post_metrics([
+    mock(d.instance.mackerel).post_metrics([
       {"hostId"=>"xyz", "value"=>1.0, "time"=>1399997498, "name"=>"custom.service.val1"},
       {"hostId"=>"xyz", "value"=>2.0, "time"=>1399997498, "name"=>"custom.service.val2"},
       {"hostId"=>"xyz", "value"=>3.0, "time"=>1399997498, "name"=>"custom.service.val3"},
       {"hostId"=>"xyz", "value"=>5.0, "time"=>1399997498, "name"=>"custom.service.val1"},
       {"hostId"=>"xyz", "value"=>6.0, "time"=>1399997498, "name"=>"custom.service.val2"},
       {"hostId"=>"xyz", "value"=>7.0, "time"=>1399997498, "name"=>"custom.service.val3"},
+      {"hostId"=>"xyz", "value"=>9.0, "time"=>1399997498, "name"=>"custom.service.val1"},
+      {"hostId"=>"xyz", "value"=>10.0, "time"=>1399997498, "name"=>"custom.service.val2"},
     ])
 
     ENV["TZ"]="Asia/Tokyo"
     t = Time.strptime('2014-05-14 01:11:38', '%Y-%m-%d %T')
     d.emit({'val1' => 1, 'val2' => 2, 'val3' => 3, 'val4' => 4}, t)
     d.emit({'val1' => 5, 'val2' => 6, 'val3' => 7, 'val4' => 8}, t)
+    d.emit({'val1' => 9, 'val2' => 10}, t)
     d.run()
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mackerel
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - tksmd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mackerel-client