fluent-plugin-mackerel 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzRhYWRlZGQ3YmJjMDZjZTk5YjgzMjIwY2I2YTllOTZkZDdlMjZhOQ==
+    YjlkYmU3MGQ1YTUzNDdmZWYwMDlkMTkwNDk2MGNlY2Y1YjJjNDViMQ==
   data.tar.gz: !binary |-
-    NDgyMmQ2MWQwOTY3MmRmM2MwMGM2ODdmYzM5OTNiOTI3YzI0YjdlNw==
+    MWY0MDkyMWY3YTg0ODgyNTI1ZTFjMzE2Yjc3YTVhNzhiNGUyMzk5NQ==
 SHA512:
   metadata.gz: !binary |-
-    YjVkNGZkM2RhNmQxYzUzYzQ2OTk0ZmRmZTdiNzkzYTNiOTAwMGNmNDQ0MDVl
-    ODQzZDI1YTI1MDEyODQ2NDQ3MDc4ZDU2YjMyMDIxYTc2Zjk3NzMzZmFmNGI5
-    ZWY0M2I3MzYzNzczYzMyMjQ0NDRjYTExOTFhYTQ4OThmMGZiNDc=
+    Y2M3MjQ3NDIyNjQxZjFlNjRhMDAyNjViYzI1NmRmMmU5NzdhODBkYzUxN2M5
+    YTBhZTY4MDc4MjhmY2Y2YWM0NWQxZGQyNmU4MGQzOGRhMGMxNzliMTkxOGE4
+    MzQ1N2YzNmNkOWI0NTUzMzVmMDI5ZWRkMWUwNzliNDY2NGI4NzM=
   data.tar.gz: !binary |-
-    ZThiMDZmNzczMzU4ZmFiNTU4Y2VhNGU2YmQzNjdiNDA1OWE5MzA4MDJiM2Qx
-    YWNiOWQ5OGJiNjg2MTY2ZTMzNmEwNWQ2YTg5ZGQyNmUzYmU4ZmU1MjdjZWI0
-    ZWJjMDZmMzEyOTU3OTc2Yjc5ZDI1NzRiNzAxMGNlNDY3ZWFjZTg=
+    MzBjZjYxOThmNjhlNzY5NmFjOWNkOTdmYzg0NTY0ZTFiYWI3N2EzZTg2YmVi
+    MDNkYTJjY2IwY2U5NWUyNTk3ZjZhZDIwNTgzZjA3MzJmNGQxMzhhMThjMWUy
+    MzIxMzE0YmFkY2VjZjhhODYxNTZiOGYyMmEwODg2MDBhMGJhNTk=

data/README.md

@@ -44,6 +44,17 @@ 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.
 
+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.
+
+```
+<match ...>
+  type mackerel
+  api_key 123456
+  service yourservice
+  metrics_name http_status.${out_key}
+  out_key_pattern [2-5]xx_count
+```
+
 You can use `${[n]}` for `mackerel_name` where `n` represents any decimal number including negative value,
 
 ```

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

@@ -9,7 +9,8 @@ module Fluent
     config_param :hostid_path, :string, :default => nil
     config_param :service, :string, :default => nil
     config_param :metrics_name, :string, :default => nil
-    config_param :out_keys, :string
+    config_param :out_keys, :string, :default => nil
+    config_param :out_key_pattern, :string, :default => nil
     config_param :origin, :string, :default => nil
 
     attr_reader :mackerel
@@ -27,7 +28,16 @@ module Fluent
       super
 
       @mackerel = Mackerel::Client.new(:mackerel_api_key => conf['api_key'], :mackerel_origin => conf['origin'])
-      @out_keys = @out_keys.split(',')
+
+      if @out_keys
+        @out_keys = @out_keys.split(',')
+      end
+      if @out_key_pattern
+        @out_key_pattern = Regexp.new(@out_key_pattern)
+      end
+      if @out_keys.nil? and @out_key_pattern.nil?
+        raise Fluent::ConfigError, "Either 'out_keys' or 'out_key_pattern' must be specifed."
+      end
 
       if @flush_interval < 60
         log.info("flush_interval less than 60s is not allowed and overwritten to 60s")
@@ -89,10 +99,14 @@ module Fluent
       chunk.msgpack_each do |(tag,time,record)|
 
         tokens = tag.split('.')
-        out_keys.map do |key|
 
-          next unless record.has_key?(key)
+        if @out_keys
+          out_keys = @out_keys.select{|key| record.has_key?(key)}
+        else # @out_key_pattern
+          out_keys = record.keys.select{|key| @out_key_pattern.match(key)}
+        end
 
+        out_keys.map do |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

@@ -46,6 +46,21 @@ class MackerelOutputTest < Test::Unit::TestCase
     origin example.domain
   ]
 
+  CONFIG_NO_OUT_KEYS = %[
+    type mackerel
+    api_key 123456
+    hostid xyz
+    metrics_name service.${out_key}
+  ]
+
+  CONFIG_OUT_KEY_PATTERN = %[
+    type mackerel
+    api_key 123456
+    hostid xyz
+    metrics_name service.${out_key}
+    out_key_pattern ^val[0-9]$
+  ]
+
   def create_driver(conf = CONFIG, tag='test')
     Fluent::Test::BufferedOutputTestDriver.new(Fluent::MackerelOutput, tag).configure(conf)
   end
@@ -64,6 +79,10 @@ class MackerelOutputTest < Test::Unit::TestCase
       d = create_driver(CONFIG_BLANK_METRICS)
     }
 
+    assert_raise(Fluent::ConfigError) {
+      d = create_driver(CONFIG_NO_OUT_KEYS)
+    }
+
     d = create_driver(CONFIG_SMALL_FLUSH_INTERVAL)
     assert_equal d.instance.instance_variable_get(:@flush_interval), 60
 
@@ -76,6 +95,10 @@ class MackerelOutputTest < Test::Unit::TestCase
     assert_equal d.instance.instance_variable_get(:@metrics_name), 'service.${out_key}'
     assert_equal d.instance.instance_variable_get(:@out_keys), ['val1','val2','val3']
     assert_equal d.instance.instance_variable_get(:@flush_interval), 60
+
+    d = create_driver(CONFIG_OUT_KEY_PATTERN)
+    assert_match d.instance.instance_variable_get(:@out_key_pattern), "val1"
+    assert_no_match d.instance.instance_variable_get(:@out_key_pattern), "foo"
   end
 
   def test_write
@@ -99,4 +122,17 @@ class MackerelOutputTest < Test::Unit::TestCase
     d.run()
   end
 
+  def test_write_pattern
+    d = create_driver(CONFIG_OUT_KEY_PATTERN)
+    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"},
+    ])
+
+    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
+
 end

metadata

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