fluent-plugin-mackerel 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTY0NzJkZjgzMDMwNzNkNGY1MjdkYmQ5ZTNlNzA2ZTAwZjg2N2I3Nw==
+    ZmY3Njg2MTIyNGI1Mzc5ODViZmNhMGQ4ZGYzNWE0ZWViMzM1ZTJhOA==
   data.tar.gz: !binary |-
-    MzAyNDI3MTdlODNlMzhhNGMwMzEyNmJhOTdkODdlYzY0ZDNiOTc0MQ==
+    NjM0ZDA1YjNlMjU2OWUyOGRkZjk3YTI1NjVkMjA0ZmE3ZDg2ZDRjZA==
 SHA512:
   metadata.gz: !binary |-
-    OWU4YzZlM2Q1Zjk5MzY5OGI2ZWVjODUzYWU0YjY3ZmU0M2Y4YjAzMDVkMjRk
-    Yjk5N2U1NzNlNzQwYWI1YjQyNmVmMGM3NzFkM2Q3NDQ3OTg1Y2E3ODYzZDdh
-    MjljZDg0MmU1YWUyNzhkNDJjMDQ2YTkxYmRjNmI0ZTI0YjM1YmY=
+    ZGYzY2ExMjJhZWY4MGM2Y2QwMjE1ZGRlMGIxOTFhMzdkYWM4ZTQ3ZTIwZDM5
+    MWUxNTQ4MzJhZTAxMmNiOTUxOTQ3YmJiMGY5YWNmMzViYjY1NDdkMzgxZTQw
+    MWMwNDE1MTZlNmIzNTFjNjUwMzFmYTExNTYwOTE0ZTZiNjgyYTk=
   data.tar.gz: !binary |-
-    OTYwYjM0ZGUwMmRjMzRlMjNjYjg2ODIyMWIwMjc5ZWI0OGNlZTkwZmFjNWEx
-    MjYwZWZjZWRiNjE4Yzc0NTkyZmY0NjhjZjc3YTkyZjU5ODA3NTU1MTI5MmMz
-    YmM1NjFmODBkOGYwMzcwOTY1MWRhZTU5ZTdiNWQ3MTlkNzhiNGI=
+    YTFlYjgwOTIyY2M1MGNkN2Q1NjBmZmE5ZDIwODFjMzk2N2ZlMGJiNDk2MWEy
+    OThiYmRkMWViZTVmNTNmZjQ0ZGJkMjBmY2I2YmFkZTdkOGIwOTY1MzI1Y2E3
+    YzI3OWU3Y2MxN2JiZDYyOTljNDEwMDA3YmMwMjRjMzdhMmRkZWM=

data/README.md

@@ -1,4 +1,4 @@
-# fluent-plugin-mackerel
+# fluent-plugin-mackerel [![Build Status](https://travis-ci.org/tksmd/fluent-plugin-mackerel.png?branch=master)](https://travis-ci.org/tksmd/fluent-plugin-mackerel)
 
 ## Overview
 
@@ -10,10 +10,10 @@ Install with gem or fluent-gem command as:
 
 ```
 # for fluentd
-$ gem install fluent-plugin-typetalk
+$ gem install fluent-plugin-mackerel
 
 # for td-agent
-$ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-typetalk
+$ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-mackerel
 ```
 
 ## Configuration
@@ -26,16 +26,17 @@ This plugin uses [APIv0](http://help-ja.mackerel.io/entry/spec/api/v0) of macker
   type mackerel
   api_key 123456
   hostid xyz
-  metrics_prefix http_status
+  metrics_prefix custom.http_status
   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:
 ```
 {
   "hostId": "xyz",
-  "name": "http_status.2xx_count",
+  "name": "custom.http_status.2xx_count",
   "time": 1399997498,
   "value": 100.0
 }

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

data/lib/fluent/plugin/out_mackerel.rb

@@ -5,9 +5,14 @@ module Fluent
     config_param :api_key, :string
     config_param :hostid, :string, :default => nil
     config_param :hostid_path, :string, :default => nil
-    config_param :metrics_prefix, :string
     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
@@ -38,6 +43,7 @@ module Fluent
         @hostid = File.open(@hostid_path).read
       end
 
+      log.info("metrics_prefix is configured to #{@metrics_prefix}")
     end
 
     def start
@@ -110,9 +116,9 @@ module Fluent
 
     def wait_for_minute
       # limit request once per minute
-      wait_secs = @last_posted ? @last_posted + 60 - Time.now.to_i : 0
+      wait_secs = @last_posted ? @last_posted + 60 - Fluent::Engine.now : 0
       sleep wait_secs if wait_secs > 0
-      @last_posted = Time.now.to_i
+      @last_posted = Fluent::Engine.now
       wait_secs > 0
     end
 

data/test/plugin/test_out_mackerel.rb

@@ -10,7 +10,7 @@ class MackerelOutputTest < Test::Unit::TestCase
     type mackerel
     api_key 123456
     hostid xyz
-    metrics_prefix service
+    metrics_prefix custom.service
     out_keys val1,val2,val3
   ]
 
@@ -21,7 +21,23 @@ class MackerelOutputTest < Test::Unit::TestCase
     out_keys val1,val2,val3
   ]
 
+  CONFIG_BLANK_METRICS = %[
+    type mackerel
+    api_key 123456
+    metrics_prefix
+    out_keys val1,val2,val3
+  ]
+
   CONFIG_SMALL_FLUSH_INTERVAL = %[
+    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
@@ -44,13 +60,20 @@ class MackerelOutputTest < Test::Unit::TestCase
       d = create_driver(CONFIG_NOHOST)
     }
 
+    assert_raise(Fluent::ConfigError) {
+      d = create_driver(CONFIG_BLANK_METRICS)
+    }
+
     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), 'service'
+    assert_equal d.instance.instance_variable_get(:@metrics_prefix), 'custom.service'
     assert_equal d.instance.instance_variable_get(:@out_keys), ['val1','val2','val3']
     assert_equal d.instance.instance_variable_get(:@flush_interval), 60
   end
@@ -58,12 +81,12 @@ class MackerelOutputTest < Test::Unit::TestCase
   def test_write
     d = create_driver()
     stub(d.instance.mackerel).post_metrics([
-      {"hostId"=>"xyz", "value"=>1.0, "time"=>1399997498, "name"=>"service.val1"},
-      {"hostId"=>"xyz", "value"=>2.0, "time"=>1399997498, "name"=>"service.val2"},
-      {"hostId"=>"xyz", "value"=>3.0, "time"=>1399997498, "name"=>"service.val3"},
-      {"hostId"=>"xyz", "value"=>5.0, "time"=>1399997498, "name"=>"service.val1"},
-      {"hostId"=>"xyz", "value"=>6.0, "time"=>1399997498, "name"=>"service.val2"},
-      {"hostId"=>"xyz", "value"=>7.0, "time"=>1399997498, "name"=>"service.val3"},
+      {"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"},
     ])
 
     ENV["TZ"]="Asia/Tokyo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mackerel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - tksmd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler