fluent-plugin-mackerel 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmY3Njg2MTIyNGI1Mzc5ODViZmNhMGQ4ZGYzNWE0ZWViMzM1ZTJhOA==
+    YmUyN2IyOTAzYjEwYTBmZGViNzkzYWEzYzY0MjMwNjE1MTE1OTFkNw==
   data.tar.gz: !binary |-
-    NjM0ZDA1YjNlMjU2OWUyOGRkZjk3YTI1NjVkMjA0ZmE3ZDg2ZDRjZA==
+    NTVlZTE0ZDc3N2M0OWY2YTE2ZWE4ZDhjYzU2ZTJkN2RjMzllMmYxOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGYzY2ExMjJhZWY4MGM2Y2QwMjE1ZGRlMGIxOTFhMzdkYWM4ZTQ3ZTIwZDM5
-    MWUxNTQ4MzJhZTAxMmNiOTUxOTQ3YmJiMGY5YWNmMzViYjY1NDdkMzgxZTQw
-    MWMwNDE1MTZlNmIzNTFjNjUwMzFmYTExNTYwOTE0ZTZiNjgyYTk=
+    NGQ1ODE0MjRmZGMzNDlkNmU4YmZhY2RmN2IwYzQ2MDYwNWMyOWY1NGYwZTY4
+    NTA5YTc1N2I3NDBhNjU1NGJlODJlODg2ZWNjYTdmNDhhNjIzMjg2ZGI0YThk
+    Y2FjMWEyNzVkNDZkOThlN2RiNzQ5MDM5ZTA1MjUxNDk4N2I2ZWU=
   data.tar.gz: !binary |-
-    YTFlYjgwOTIyY2M1MGNkN2Q1NjBmZmE5ZDIwODFjMzk2N2ZlMGJiNDk2MWEy
-    OThiYmRkMWViZTVmNTNmZjQ0ZGJkMjBmY2I2YmFkZTdkOGIwOTY1MzI1Y2E3
-    YzI3OWU3Y2MxN2JiZDYyOTljNDEwMDA3YmMwMjRjMzdhMmRkZWM=
+    OWNjZWZlNjYzZjdmMDBjMWM0MWM2NzJjMWVhNTYwZDMxZTM4YTc4Y2FmZTk0
+    MTNlYWNjMTFiOWI1YjIyNGUzZjMwYWNiOTQ2NWI2MGMwM2EyODkyYTk3ZDdj
+    YTc5OTk2YjFhMTFhNDBhMDg2Yjk0MjM4Y2Y5ODZiZTZlZjg3Nzc=

data/README.md

@@ -4,6 +4,8 @@
 
 [Fluentd](http://fluentd.org) plugin to send metrics to [mackerel.io](http://mackerel.io/).
 
+This plugin includes two components, namely MackerelOutput and MackerelHostidTagOutput. The former is used to send metrics to mackerel and the latter is used to append mackerel hostid to tag or record.
+
 ## Installation
 
 Install with gem or fluent-gem command as:
@@ -18,7 +20,7 @@ $ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-mackerel
 
 ## Configuration
 
-### Usage
+### MackerelOutput
 
 This plugin uses [APIv0](http://help-ja.mackerel.io/entry/spec/api/v0) of mackerel.io.
 ```
@@ -26,11 +28,10 @@ This plugin uses [APIv0](http://help-ja.mackerel.io/entry/spec/api/v0) of macker
   type mackerel
   api_key 123456
   hostid xyz
-  metrics_prefix custom.http_status
+  metrics_name http_status.${out_key}
   out_keys 2xx_count,3xx_count,4xx_count,5xx_count
 </match>
 ```
-When metrics_prefix doesn't start with "custom.", "custom." is automatically appended at its beginning.
 
 Then the sent metric data will look like this:
 ```
@@ -41,10 +42,43 @@ 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_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.
 
+You can also send ["service" metric](http://help-ja.mackerel.io/entry/spec/api/v0#service-metric-value-post) as follows.
+```
+<match ...>
+  type mackerel
+  api_key 123456
+  service yourservice
+  metrics_name http_status.${out_key}
+  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.
 
+Since version 0.0.4, metrics_prefix was removed and you should use metrics_name instead.
+
+### MackerelHostidTagOutput
+
+If you want to add the hostid to the record with a certain key name, do the following.
+```
+<match ...>
+  type mackerel_hostid_tag
+  add_to record
+  key_name mackerel_hostid
+</match>
+```
+As shown above, key_name field is required. Supposed host_id is "xyz" and input is `["test", 1407650400, {"val1"=>1, "val2"=>2, "val3"=>3, "val4"=>4}]`, then you can get `["test", 1407650400, {"val1"=>1, "val2"=>2, "val3"=>3, "val4"=>4, "mackerel_hostid"=>"xyz"}]`
+
+To append hostid to the tag, you can simply configure "add_to" as "tag" like this.
+```
+<match ...>
+  type mackerel_hostid_tag
+  add_to tag
+</match>
+```
+When input is `["test", 1407650400, {"val1"=>1, "val2"=>2, "val3"=>3, "val4"=>4}]`, then the output will be `["test.xyz", 1407650400, {"val1"=>1, "val2"=>2, "val3"=>3, "val4"=>4}]`
+
 ## TODO
 
 Pull requests are very welcome!!

data/fluent-plugin-mackerel.gemspec

@@ -4,8 +4,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mackerel"
-  spec.version       = "0.0.3"
-  spec.authors       = ["tksmd"]
+  spec.version       = "0.0.4"
+  spec.authors       = ["tksmd","hatz48"]
   spec.email         = ["someda@isenshi.com"]
   spec.description   = %q{fluent plugin to send metrics to mackerel.io}
   spec.summary       = spec.description
@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "mackerel-client"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rr", ">= 1.0.0"

data/lib/fluent/plugin/out_mackerel.rb

@@ -1,3 +1,5 @@
+require 'mackerel/client'
+
 module Fluent
   class MackerelOutput < Fluent::BufferedOutput
     Fluent::Plugin.register_output('mackerel', self)
@@ -5,14 +7,10 @@ module Fluent
     config_param :api_key, :string
     config_param :hostid, :string, :default => nil
     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 :metrics_prefix do |val|
-      val.chomp!(".")
-      raise Fluent::ConfigError, "metrics_prefix is not allowed to be blank" if val.empty?
-      val.start_with?("custom.") ? val : "custom." << val
-    end
-
     attr_reader :mackerel
 
     # Define `log` method for v0.10.42 or earlier
@@ -27,23 +25,50 @@ module Fluent
     def configure(conf)
       super
 
-      @mackerel = Mackerel.new(conf['api_key'])
+      @mackerel = Mackerel::Client.new(:mackerel_api_key => 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")
+        log.info("flush_interval less than 60s is not allowed and overwritten 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
-
       unless @hostid_path.nil?
         @hostid = File.open(@hostid_path).read
       end
 
-      log.info("metrics_prefix is configured to #{@metrics_prefix}")
+      if @hostid.nil? and @service.nil?
+        raise Fluent::ConfigError, "Either 'hostid' or 'hostid_path' or 'service' must be specifed."
+      end
+
+      if @hostid and @service
+        raise Fluent::ConfigError, "Niether 'hostid' and 'service' cannot be specifed."
+      end
+
+      unless @hostid.nil?
+        if matched = @hostid.match(/^\${tag_parts\[(\d+)\]}$/)
+          hostid_idx = matched[1].to_i
+          @hostid_processor = Proc.new{ |args| args[:tokens][hostid_idx] }
+        else
+          @hostid_processor = Proc.new{ @hostid }
+        end
+      end
+
+      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
+        }
+      end
     end
 
     def start
@@ -61,18 +86,35 @@ module Fluent
     def write(chunk)
       metrics = []
       chunk.msgpack_each do |(tag,time,record)|
+
+        tokens = tag.split('.')
         out_keys.map do |key|
-          metrics << {
-            'hostId' => @hostid,
+          name = @name_processor.nil? ? key :
+            @name_processor.map{ |p| p.call(:out_key => key, :tokens => tokens) }.join('.')
+
+          metric = {
             'value' => record[key].to_f,
             'time' => time,
-            'name' => "%s.%s" % [@metrics_prefix, key]
+            'name' => "%s.%s" % ['custom', name]
           }
+          metric['hostId'] = @hostid_processor.call(:tokens => tokens) if @hostid
+
+          metrics << metric
         end
       end
 
       begin
-        @mackerel.post_metrics(metrics) unless metrics.empty?
+        while true
+          partial = metrics.slice!(0, 100)
+          if partial.empty?
+            break
+          end
+          if @hostid
+            @mackerel.post_metrics(partial)
+          else
+            @mackerel.post_service_metrics(@service, partial)
+          end
+        end
       rescue => e
         log.error("out_mackerel:", :error_class => e.class, :error => e.message)
       end
@@ -80,50 +122,4 @@ module Fluent
     end
   end
 
-  class Mackerel
-
-    USER_AGENT = "fluent-plugin-mackerel Ruby/#{RUBY_VERSION}"
-
-    def initialize(api_key)
-      require 'net/http'
-      require 'json'
-
-      @api_key = api_key
-      @http = Net::HTTP.new('mackerel.io', 443)
-      @http.use_ssl = true
-    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',
-        'User-Agent' => USER_AGENT
-      })
-      req.body = metrics.to_json
-      res = @http.request(req)
-
-      if res.is_a?(Net::HTTPUnauthorized)
-        raise MackerelError, "invalid api key used. check api_key in your configuration."
-      end
-
-      unless res and res.is_a?(Net::HTTPSuccess)
-        raise MackerelError, "failed to post, code: #{res.code}"
-      end
-    end
-
-    def wait_for_minute
-      # limit request once per minute
-      wait_secs = @last_posted ? @last_posted + 60 - Fluent::Engine.now : 0
-      sleep wait_secs if wait_secs > 0
-      @last_posted = Fluent::Engine.now
-      wait_secs > 0
-    end
-
-  end
-
-  class MackerelError < RuntimeError; end
-
-end
+end

data/lib/fluent/plugin/out_mackerel_hostid_tag.rb

@@ -0,0 +1,60 @@
+module Fluent
+
+  class MackerelHostidTagOutput < Fluent::Output
+    Fluent::Plugin.register_output('mackerel_hostid_tag', self)
+
+    config_param :hostid_path, :string, :default => '/var/lib/mackerel-agent/id'
+    config_param :add_to, :string
+    config_param :key_name, :default => nil
+    config_param :add_prefix, :string, :default => nil
+    config_param :remove_prefix, :string, :default => nil
+
+    # Define `log` method for v0.10.42 or earlier
+    unless method_defined?(:log)
+      define_method("log") { $log }
+    end
+
+    def initialize
+      super
+    end
+
+    def configure(conf)
+      super
+      @hostid = File.open(@hostid_path).read
+      if @add_to == 'record' and @key_name.nil?
+        raise Fluent::ConfigError, "'key_name' must be specified"
+      end
+      if @remove_prefix
+        @removed_prefix_string = @remove_prefix + '.'
+        @removed_length = @removed_prefix_string.length
+      end
+      @added_prefix_string = @add_prefix + '.' unless @add_prefix.nil?
+    end
+
+    def emit(tag, es, chain)
+      if @remove_prefix and
+          ( (tag.start_with?(@removed_prefix_string) and tag.length > @removed_length) or tag == @remove_prefix)
+        tag = tag[@removed_length..-1]
+      end
+      if tag.length > 0
+        tag = @added_prefix_string + tag if @added_prefix_string
+      else
+        tag = @add_prefix
+      end
+      if @add_to == 'tag'
+        tag = [tag, @hostid].join('.')
+      end
+
+      es.each do |time, record|
+        if @add_to == 'record'
+          record[@key_name] = @hostid
+        end
+        Fluent::Engine.emit(tag, time, record)
+      end
+
+      chain.next
+    end
+
+  end
+
+end

data/test/helper.rb

@@ -24,6 +24,7 @@ unless ENV.has_key?('VERBOSE')
 end
 
 require 'fluent/plugin/out_mackerel'
+require 'fluent/plugin/out_mackerel_hostid_tag'
 
 class Test::Unit::TestCase
 end

data/test/plugin/hostid

@@ -0,0 +1 @@
+xyz

data/test/plugin/test_out_mackerel.rb

@@ -10,14 +10,14 @@ class MackerelOutputTest < Test::Unit::TestCase
     type mackerel
     api_key 123456
     hostid xyz
-    metrics_prefix custom.service
+    metrics_name service.${out_key}
     out_keys val1,val2,val3
   ]
 
   CONFIG_NOHOST = %[
     type mackerel
     api_key 123456
-    metrics_prefix service
+    metrics_name service.${out_key}
     out_keys val1,val2,val3
   ]
 
@@ -32,16 +32,7 @@ class MackerelOutputTest < Test::Unit::TestCase
     type mackerel
     api_key 123456
     hostid xyz
-    metrics_prefix custom.service
-    out_keys val1,val2,val3
-    flush_interval 1s
-  ]
-
-  CONFIG_NOT_INSUFFICIENT_PREFIX = %[
-    type mackerel
-    api_key 123456
-    hostid xyz
-    metrics_prefix service
+    metrics_name service.${out_key}
     out_keys val1,val2,val3
     flush_interval 1s
   ]
@@ -67,13 +58,10 @@ class MackerelOutputTest < Test::Unit::TestCase
     d = create_driver(CONFIG_SMALL_FLUSH_INTERVAL)
     assert_equal d.instance.instance_variable_get(:@flush_interval), 60
 
-    d = create_driver(CONFIG_NOT_INSUFFICIENT_PREFIX)
-    assert_equal d.instance.instance_variable_get(:@metrics_prefix), "custom.service"
-
     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), 'custom.service'
+    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
   end
@@ -96,13 +84,4 @@ 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
+end

data/test/plugin/test_out_mackerel_hostid_tag.rb

@@ -0,0 +1,243 @@
+# coding: utf-8
+
+require 'helper'
+
+class MackerelHostidTagOutputTest < Test::Unit::TestCase
+
+  def setup
+    Fluent::Test.setup
+  end
+
+  HOSTID_PATH = File.dirname(__FILE__) + "/hostid"
+
+  CONFIG = %[
+    type mackerel_hostid_tag
+    hostid_path #{HOSTID_PATH}
+    add_to tag
+  ]
+
+  CONFIG_RECORD = %[
+    type mackerel_hostid_tag
+    hostid_path #{HOSTID_PATH}
+    add_to record
+    key_name mackerel_hostid
+  ]
+
+  CONFIG_RECORD_NO_KEY_NAME = %[
+    type mackerel_hostid_tag
+    hostid_path #{HOSTID_PATH}
+    add_to record
+  ]
+
+  CONFIG_TAG_REMOVE = %[
+    type mackerel_hostid_tag
+    hostid_path #{HOSTID_PATH}
+    add_to record
+    key_name mackerel_hostid
+    remove_prefix test
+  ]
+
+  CONFIG_TAG_ADD = %[
+    type mackerel_hostid_tag
+    hostid_path #{HOSTID_PATH}
+    add_to record
+    key_name mackerel_hostid
+    add_prefix mackerel
+  ]
+
+  CONFIG_TAG_BOTH = %[
+    type mackerel_hostid_tag
+    hostid_path #{HOSTID_PATH}
+    add_to record
+    key_name mackerel_hostid
+    remove_prefix test
+    add_prefix mackerel
+  ]
+
+  CONFIG_TAG_BOTH_TAG = %[
+    type mackerel_hostid_tag
+    hostid_path #{HOSTID_PATH}
+    add_to tag
+    remove_prefix test
+    add_prefix mackerel
+  ]
+
+  def create_driver(conf = CONFIG, tag='test')
+    Fluent::Test::OutputTestDriver.new(Fluent::MackerelHostidTagOutput, tag).configure(conf)
+  end
+
+  def test_configure
+
+    assert_raise(Fluent::ConfigError) {
+      d = create_driver('')
+    }
+
+    assert_raise(Fluent::ConfigError) {
+      d = create_driver(CONFIG_RECORD_NO_KEY_NAME)
+    }
+
+    d = create_driver()
+    assert_equal d.instance.instance_variable_get(:@hostid), 'xyz'
+    assert_equal d.instance.instance_variable_get(:@add_to), 'tag'
+
+    d = create_driver(CONFIG_RECORD)
+    assert_equal d.instance.instance_variable_get(:@hostid), 'xyz'
+    assert_equal d.instance.instance_variable_get(:@add_to), 'record'
+    assert_equal d.instance.instance_variable_get(:@key_name), 'mackerel_hostid'
+
+  end
+
+  def test_write_tag
+
+    d = create_driver()
+
+    ENV["TZ"]="Asia/Tokyo"
+    t = Time.strptime('2014-08-10 15:00:00', '%Y-%m-%d %T')
+    d.run do
+      d.emit({'val1' => 1, 'val2' => 2, 'val3' => 3, 'val4' => 4}, t)
+      d.emit({'val1' => 5, 'val2' => 6, 'val3' => 7, 'val4' => 8}, t)
+    end
+
+    emits = d.emits
+    assert_equal 2, emits.length
+    assert_equal 'test.xyz', emits[0][0] # tag
+    assert_equal 1407650400, emits[0][1] # time
+    assert_equal 4, emits[0][2].length # record
+    assert_equal 1, emits[0][2]["val1"] # record
+    assert_equal 2, emits[0][2]["val2"] # record
+    assert_equal 3, emits[0][2]["val3"] # record
+    assert_equal 4, emits[0][2]["val4"] # record
+
+    assert_equal 'test.xyz', emits[1][0] # tag
+    assert_equal 1407650400, emits[1][1] # time
+    assert_equal 4, emits[1][2].length # record
+    assert_equal 5, emits[1][2]["val1"] # record
+    assert_equal 6, emits[1][2]["val2"] # record
+    assert_equal 7, emits[1][2]["val3"] # record
+    assert_equal 8, emits[1][2]["val4"] # record
+  end
+
+  def test_write_record
+
+    d = create_driver(CONFIG_RECORD)
+
+    ENV["TZ"]="Asia/Tokyo"
+    t = Time.strptime('2014-08-10 15:00:00', '%Y-%m-%d %T')
+    d.run do
+      d.emit({'val1' => 1, 'val2' => 2, 'val3' => 3, 'val4' => 4}, t)
+      d.emit({'val1' => 5, 'val2' => 6, 'val3' => 7, 'val4' => 8}, t)
+    end
+
+    emits = d.emits
+    assert_equal 2, emits.length
+    assert_equal 'test', emits[0][0] # tag
+    assert_equal 1407650400, emits[0][1] # time
+    assert_equal 5, emits[0][2].length # record length
+    assert_equal 1, emits[0][2]["val1"] # record
+    assert_equal 2, emits[0][2]["val2"] # record
+    assert_equal 3, emits[0][2]["val3"] # record
+    assert_equal 4, emits[0][2]["val4"] # record
+    assert_equal "xyz", emits[0][2]["mackerel_hostid"] # record
+
+    assert_equal 'test', emits[1][0] # tag
+    assert_equal 1407650400, emits[1][1] # time
+    assert_equal 5, emits[1][2].length # record length
+    assert_equal 5, emits[1][2]["val1"] # record
+    assert_equal 6, emits[1][2]["val2"] # record
+    assert_equal 7, emits[1][2]["val3"] # record
+    assert_equal 8, emits[1][2]["val4"] # record
+    assert_equal "xyz", emits[1][2]["mackerel_hostid"] # record
+  end
+
+  def test_write_record_remove_prefix
+
+    d = create_driver(CONFIG_TAG_REMOVE, 'test.service')
+
+    ENV["TZ"]="Asia/Tokyo"
+    t = Time.strptime('2014-08-10 15:00:00', '%Y-%m-%d %T')
+    d.run do
+      d.emit({'val1' => 1, 'val2' => 2, 'val3' => 3, 'val4' => 4}, t)
+    end
+
+    emits = d.emits
+    assert_equal 1, emits.length
+    assert_equal 'service', emits[0][0] # tag
+    assert_equal 1407650400, emits[0][1] # time
+    assert_equal 5, emits[0][2].length # record length
+    assert_equal 1, emits[0][2]["val1"] # record
+    assert_equal 2, emits[0][2]["val2"] # record
+    assert_equal 3, emits[0][2]["val3"] # record
+    assert_equal 4, emits[0][2]["val4"] # record
+    assert_equal "xyz", emits[0][2]["mackerel_hostid"] # record
+
+  end
+
+  def test_write_record_add_prefix
+
+    d = create_driver(CONFIG_TAG_ADD)
+
+    ENV["TZ"]="Asia/Tokyo"
+    t = Time.strptime('2014-08-10 15:00:00', '%Y-%m-%d %T')
+    d.run do
+      d.emit({'val1' => 1, 'val2' => 2, 'val3' => 3, 'val4' => 4}, t)
+    end
+
+    emits = d.emits
+    assert_equal 1, emits.length
+    assert_equal 'mackerel.test', emits[0][0] # tag
+    assert_equal 1407650400, emits[0][1] # time
+    assert_equal 5, emits[0][2].length # record length
+    assert_equal 1, emits[0][2]["val1"] # record
+    assert_equal 2, emits[0][2]["val2"] # record
+    assert_equal 3, emits[0][2]["val3"] # record
+    assert_equal 4, emits[0][2]["val4"] # record
+    assert_equal "xyz", emits[0][2]["mackerel_hostid"] # record
+
+  end
+
+  def test_write_record_remove_and_add_prefix
+
+    d = create_driver(CONFIG_TAG_BOTH, 'test.service')
+
+    ENV["TZ"]="Asia/Tokyo"
+    t = Time.strptime('2014-08-10 15:00:00', '%Y-%m-%d %T')
+    d.run do
+      d.emit({'val1' => 1, 'val2' => 2, 'val3' => 3, 'val4' => 4}, t)
+    end
+
+    emits = d.emits
+    assert_equal 1, emits.length
+    assert_equal 'mackerel.service', emits[0][0] # tag
+    assert_equal 1407650400, emits[0][1] # time
+    assert_equal 5, emits[0][2].length # record length
+    assert_equal 1, emits[0][2]["val1"] # record
+    assert_equal 2, emits[0][2]["val2"] # record
+    assert_equal 3, emits[0][2]["val3"] # record
+    assert_equal 4, emits[0][2]["val4"] # record
+    assert_equal "xyz", emits[0][2]["mackerel_hostid"] # record
+
+  end
+
+  def test_write_tag_remove_and_add_prefix
+
+    d = create_driver(CONFIG_TAG_BOTH_TAG, 'test.service')
+
+    ENV["TZ"]="Asia/Tokyo"
+    t = Time.strptime('2014-08-10 15:00:00', '%Y-%m-%d %T')
+    d.run do
+      d.emit({'val1' => 1, 'val2' => 2, 'val3' => 3, 'val4' => 4}, t)
+    end
+
+    emits = d.emits
+    assert_equal 1, emits.length
+    assert_equal 'mackerel.service.xyz', emits[0][0] # tag
+    assert_equal 1407650400, emits[0][1] # time
+    assert_equal 4, emits[0][2].length # record length
+    assert_equal 1, emits[0][2]["val1"] # record
+    assert_equal 2, emits[0][2]["val2"] # record
+    assert_equal 3, emits[0][2]["val3"] # record
+    assert_equal 4, emits[0][2]["val4"] # record
+
+  end
+
+end

metadata

@@ -1,15 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mackerel
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - tksmd
+- hatz48
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mackerel-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,8 +96,11 @@ files:
 - Rakefile
 - fluent-plugin-mackerel.gemspec
 - lib/fluent/plugin/out_mackerel.rb
+- lib/fluent/plugin/out_mackerel_hostid_tag.rb
 - test/helper.rb
+- test/plugin/hostid
 - test/plugin/test_out_mackerel.rb
+- test/plugin/test_out_mackerel_hostid_tag.rb
 homepage: https://github.com/tksmd/fluent-plugin-mackerel
 licenses:
 - Apache-2.0
@@ -109,4 +127,6 @@ specification_version: 4
 summary: fluent plugin to send metrics to mackerel.io
 test_files:
 - test/helper.rb
+- test/plugin/hostid
 - test/plugin/test_out_mackerel.rb
+- test/plugin/test_out_mackerel_hostid_tag.rb