fluent-plugin-mackerel 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjlkYmU3MGQ1YTUzNDdmZWYwMDlkMTkwNDk2MGNlY2Y1YjJjNDViMQ==
+    OTNiZDMwMGM1MGFhOTdiZGE2NjNkNDJmNjAxMDg1MmIyZDllMTc4Yw==
   data.tar.gz: !binary |-
-    MWY0MDkyMWY3YTg0ODgyNTI1ZTFjMzE2Yjc3YTVhNzhiNGUyMzk5NQ==
+    Y2Y3MmIwYmIwNzFjMDZhZDhjMTdlZjcyMDBmODI3ZDcyMDQxNDIzYw==
 SHA512:
   metadata.gz: !binary |-
-    Y2M3MjQ3NDIyNjQxZjFlNjRhMDAyNjViYzI1NmRmMmU5NzdhODBkYzUxN2M5
-    YTBhZTY4MDc4MjhmY2Y2YWM0NWQxZGQyNmU4MGQzOGRhMGMxNzliMTkxOGE4
-    MzQ1N2YzNmNkOWI0NTUzMzVmMDI5ZWRkMWUwNzliNDY2NGI4NzM=
+    MDFhODQ4ZjI5NGFiYTQ0YzZmZWM4YTI0NTkyYTYyZjRhZDkwMmI5NTZiNzYx
+    ZDVlMDkwODNiMjViMTI2N2UxYzE4NDVhMmJhMzFmZmRhNmMwYTRmYzVlMzRj
+    YjFkNDZjYmM4MGIxOWVhY2MyMTg2MmVhNmUzNzM0ZjE3YzliZTU=
   data.tar.gz: !binary |-
-    MzBjZjYxOThmNjhlNzY5NmFjOWNkOTdmYzg0NTY0ZTFiYWI3N2EzZTg2YmVi
-    MDNkYTJjY2IwY2U5NWUyNTk3ZjZhZDIwNTgzZjA3MzJmNGQxMzhhMThjMWUy
-    MzIxMzE0YmFkY2VjZjhhODYxNTZiOGYyMmEwODg2MDBhMGJhNTk=
+    NDNkOTdiYTFmZmMyZTYzMWU0OTc4Zjk2Y2FiNGMyZjEzMTdhOTRkZTg4MjE1
+    OWI1OWRkY2Q4ZWM4NGIyNjI3OWE4NjVmYWFjYmYzODA0NWIxMGQ3MGM3M2Q0
+    Nzg3ZGMzYjIzODI2NTQzODdlZjk4MmViZmFjMTAyNTc0ODlkODE=

data/README.md

@@ -55,7 +55,7 @@ You can use `out_key_pattern` instead of `out_keys`. Input records whose key mat
   out_key_pattern [2-5]xx_count
 ```
 
-You can use `${[n]}` for `mackerel_name` where `n` represents any decimal number including negative value,
+You can use `${[n]}` for `metrics_name` where `n` represents any decimal number including negative value,
 
 ```
 <match mackerel.*>
@@ -129,6 +129,16 @@ To run tests, do the following.
 $ VERBOSE=1 bundle exec rake test
 ```
 
+If you want to run a certain file, run rake like this
+```
+$ VERBOSE=1 bundle exec rake test TEST=test/plugin/test_out_mackerel.rb
+```
+
+In addition, you can run specific method like this.
+```
+$ VERBOSE=1 bundle exec rake test TEST=test/plugin/test_out_mackerel.rb TESTOPTS="--name=test_configure"
+```
+
 When releasing, call rake release as follows.
 ```
 $ bundle exec rake release
@@ -148,6 +158,7 @@ For debugging purpose, you can change Mackerel endpoint by `origin` parameter li
 
 ## References
 
+* [Send service and host metric to Mackerel by using fluentd (Japanese, Official Document)](http://help-ja.mackerel.io/entry/advanced/fluentd)
 * [How to use fluent-plugin-mackerel (Japanese)](http://qiita.com/tksmd/items/1212331a5a18afe520df)
 
 ## Copyright

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.7"
+  spec.version       = "0.0.8"
   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

@@ -67,17 +67,15 @@ module Fluent
 
       if @metrics_name
         @name_processor = @metrics_name.split('.').map{ |token|
-          if token.start_with?('$')
-            token = token[2..-2]
-            if token == 'out_key'
-              Proc.new{ |args| args[:out_key] }
-            else
-              idx = token.match(/\[(-?\d+)\]/)[1].to_i
-              Proc.new{ |args| args[:tokens][idx] }
-            end
-          else
-            Proc.new{ token }
-          end
+          Proc.new{ |args|
+            token.gsub(/\${(out_key|\[(-?\d+)\])}/) {
+              if $1 == 'out_key'
+                args[:out_key]
+              else
+                args[:tokens][$1[1..-1].to_i]
+              end
+            }
+          }
         }
       end
     end
@@ -116,7 +114,6 @@ module Fluent
             'name' => "%s.%s" % ['custom', name]
           }
           metric['hostId'] = @hostid_processor.call(:tokens => tokens) if @hostid
-
           metrics << metric
         end
       end

data/test/plugin/test_out_mackerel.rb

@@ -61,6 +61,14 @@ class MackerelOutputTest < Test::Unit::TestCase
     out_key_pattern ^val[0-9]$
   ]
 
+  CONFIG_FOR_ISSUE_4 = %[
+    type mackerel
+    api_key 123456
+    hostid xyz
+    metrics_name a-${[1]}-b.${out_key}
+    out_keys val1,val2
+  ]
+
   def create_driver(conf = CONFIG, tag='test')
     Fluent::Test::BufferedOutputTestDriver.new(Fluent::MackerelOutput, tag).configure(conf)
   end
@@ -135,4 +143,53 @@ class MackerelOutputTest < Test::Unit::TestCase
     d.run()
   end
 
+  def test_write_issue4
+    d = create_driver(CONFIG_FOR_ISSUE_4, tag='test.status')
+    mock(d.instance.mackerel).post_metrics([
+      {"hostId"=>"xyz", "value"=>1.0, "time"=>1399997498, "name"=>"custom.a-status-b.val1"},
+      {"hostId"=>"xyz", "value"=>2.0, "time"=>1399997498, "name"=>"custom.a-status-b.val2"},
+    ])
+
+    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"},
+      {metrics_name: "name.${out_key}", expected: "name.val1"},
+      {metrics_name: "a-${out_key}", expected: "a-val1"},
+      {metrics_name: "${out_key}-b", expected: "val1-b"},
+      {metrics_name: "a-${out_key}-b", expected: "a-val1-b"},
+      {metrics_name: "name.a-${out_key}-b", expected: "name.a-val1-b"},
+      {metrics_name: "${out_key}-a-${out_key}", expected: "val1-a-val1"},
+      {metrics_name: "${out_keyx}", expected: "${out_keyx}"},
+      {metrics_name: "${[1]}", expected: "status"},
+      {metrics_name: "${[-1]}", expected: "status"},
+      {metrics_name: "name.${[1]}", expected: "name.status"},
+      {metrics_name: "a-${[1]}", expected: "a-status"},
+      {metrics_name: "${[1]}-b", expected: "status-b"},
+      {metrics_name: "a-${[1]}-b", expected: "a-status-b"},
+      {metrics_name: "${[0]}.${[1]}", expected: "test.status"},
+      {metrics_name: "${[0]}-${[1]}", expected: "test-status"},
+      {metrics_name: "${[0]}-${[1]}-${out_key}", expected: "test-status-val1"},
+      {metrics_name: "${[2]}", expected: ""},
+    ].map { |obj|
+      test_config = %[
+        type mackerel
+        api_key 123456
+        hostid xyz
+        metrics_name #{obj[:metrics_name]}
+        out_keys val1,val2
+      ]
+      d = create_driver(test_config, tag='test.status')
+      name_processor = d.instance.instance_variable_get(:@name_processor)
+      actual = name_processor.map{ |p| p.call(:out_key => 'val1', :tokens => ['test', 'status']) }.join('.')
+      assert_equal obj[:expected], actual
+    }
+  end
+
+
 end

metadata

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