fluent-plugin-dd 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODg3YzliYmQ2NTdjOWRjMDU1MTg0NDZmOWVmMzZlNDRkM2M0YmE4ZA==
-  data.tar.gz: !binary |-
-    MTY0NzExYzM2ZWM1YjBkNjVjOGJkZmU3MmZmYjE0ZjAwMzhiMTkzYQ==
+SHA1:
+  metadata.gz: d32c3397a0057d06d90fbb81f840017d27cd526d
+  data.tar.gz: cb5707e226e2a28b0abae125258b18c50a3c2235
 SHA512:
-  metadata.gz: !binary |-
-    ZDAyMWU5Mzk5YTA0YmQwNTBmYTNlMDQxMzU4YTBhZDhkOTNkYWIzZTU5NjQy
-    M2EwYWQ0YWRmMjViMDM5MWY1MGNiZGM4ZjcwOTgyYjlmMGI1YmQ3YjAxYzE5
-    MzU5NmU0YWJlNDQ2MjVhOTQ0OGE3Mzc0YmQzMGRhYjc3NGZjNzY=
-  data.tar.gz: !binary |-
-    OGM0ZTJmZDYzNjEwNWYwZjQ5ODA2YjUyZjU0ZTkzNGNjODRmYWRmYzk3MGE5
-    NjlkMDg5NjlkNzdmOGEwZjViNTg1MWQxYzExMWQxNDBiZGYyOTFhZmY0Mzc4
-    Zjk5OGJhYzQwMTA4MjUxOGYzNTVkOTljOTBiY2E5MmY1NDZkYzg=
+  metadata.gz: 15b1db3c558997642e120226f905f0e002728619174e10dd5bbb182e0c5478e1b943dc8cf8d12abf86b3a14b49ae91de7af6fc1add471753e0c9d3bc7a1d9e62
+  data.tar.gz: 2e18ce4ef7e1513876f1f3f54b411a714ffac4ca5648fa59ff7ce4d61405588cd1a9ef7a133115c9e9a1eb7a8992962a536a255d5dc35c1531ae811c9bba4707

data/README.md

@@ -16,6 +16,7 @@ Output plugin for Datadog
   type dd
   dd_api_key ...
   #host my_host.example.com
+  #use_fluentd_tag_for_datadog_tag false
 </match>
 ```
 

data/fluent-plugin-dd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-dd'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
   spec.description   = %q{Output plugin for Datadog}

data/lib/fluent/plugin/out_dd.rb

@@ -7,6 +7,7 @@ class Fluent::DdOutput < Fluent::BufferedOutput
 
   config_param :dd_api_key, :string
   config_param :host, :string, :default => nil
+  config_param :use_fluentd_tag_for_datadog_tag, :bool, :default => false
 
   def initialize
     super
@@ -51,8 +52,13 @@ class Fluent::DdOutput < Fluent::BufferedOutput
 
       record['metric']
     }.chunk {|tag, time, record|
-      tag = record['tag'] || tag
-      [tag] + record.values_at('metric', 'host', 'type')
+      dd_tag = record['tag']
+
+      if not dd_tag and @use_fluentd_tag_for_datadog_tag
+        dd_tag = tag
+      end
+
+      [dd_tag] + record.values_at('metric', 'host', 'type')
     }.each {|i, records|
       tag, metric, host, type = i
 

data/spec/out_dd_spec.rb

@@ -10,6 +10,20 @@ describe Fluent::DdOutput do
 
   it 'should be called emit_points' do
     run_driver do |d, dog|
+      dog.should_receive(:emit_points).with(
+        "some.metric.name",
+        [[Time.parse("2014-02-08 04:14:15 UTC"), 50.0],
+         [Time.parse("2014-02-08 04:14:15 UTC"), 100.0]],
+        {}
+      )
+
+      d.emit({"metric" => "some.metric.name", "value" => 50.0}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 100.0}, time)
+    end
+  end
+
+  it 'should be called emit_points with tag' do
+    run_driver(:use_fluentd_tag_for_datadog_tag => true) do |d, dog|
       dog.should_receive(:emit_points).with(
         "some.metric.name",
         [[Time.parse("2014-02-08 04:14:15 UTC"), 50.0],
@@ -23,7 +37,7 @@ describe Fluent::DdOutput do
   end
 
   it 'should be called emit_points for each tag' do
-    run_driver do |d, dog|
+    run_driver(:use_fluentd_tag_for_datadog_tag => true) do |d, dog|
       dog.should_receive(:emit_points).with(
         "some.metric.name",
         [[Time.parse("2014-02-08 04:14:15 UTC"), 50.0],
@@ -133,21 +147,21 @@ describe Fluent::DdOutput do
         "some.metric.name",
         [[Time.parse("2014-02-08 04:14:15 UTC"), 50.0],
          [Time.parse("2014-02-08 04:14:15 UTC"), 100.0]],
-        {:tags=>["test.default"], :host=>"www1.example.com"}
+        {:host=>"www1.example.com"}
       )
 
       dog.should_receive(:emit_points).with(
         "some.metric.name",
         [[Time.parse("2014-02-08 04:14:15 UTC"), 150.0],
          [Time.parse("2014-02-08 04:14:15 UTC"), 200.0]],
-        {:tags=>["test.default"], :host=>"www2.example.com"}
+        {:host=>"www2.example.com"}
       )
 
       dog.should_receive(:emit_points).with(
         "some.metric.name",
         [[Time.parse("2014-02-08 04:14:15 UTC"), 250.0],
          [Time.parse("2014-02-08 04:14:15 UTC"), 300.0]],
-        {:tags=>["test.default"], :host=>"www3.example.com"}
+        {:host=>"www3.example.com"}
       )
 
       d.emit({"metric" => "some.metric.name", "value" => 50.0, "host" => "www1.example.com"}, time)
@@ -165,14 +179,14 @@ describe Fluent::DdOutput do
         "some.metric.name",
         [[Time.parse("2014-02-08 04:14:15 UTC"), 50.0],
          [Time.parse("2014-02-08 04:14:15 UTC"), 100.0]],
-        {:tags=>["test.default"], :type=>"gauge"}
+        {:type=>"gauge"}
       )
 
       dog.should_receive(:emit_points).with(
         "some.metric.name",
         [[Time.parse("2014-02-08 04:14:15 UTC"), 150.0],
          [Time.parse("2014-02-08 04:14:15 UTC"), 200.0]],
-        {:tags=>["test.default"], :type=>"counter"}
+        {:type=>"counter"}
       )
 
       d.emit({"metric" => "some.metric.name", "value" => 50.0, "type" => "gauge"}, time)
@@ -188,7 +202,7 @@ describe Fluent::DdOutput do
         "some.metric.name",
         [[Time.parse("2014-02-08 04:14:15 UTC"), 50.0],
          [Time.parse("2014-02-08 04:14:15 UTC"), 100.0]],
-        {:tags=>["test.default"]}
+        {}
       )
 
       log = d.instance.log

data/spec/spec_helper.rb

@@ -18,10 +18,21 @@ def run_driver(options = {})
   dd_api_key = options[:dd_api_key] || 'test_dd_api_key'
   host = options[:host] || 'test_host'
 
+  option_keys = [
+    :use_fluentd_tag_for_datadog_tag
+  ]
+
+  additional_options = option_keys.map {|key|
+    if options[key]
+      "#{key} #{options[key]}"
+    end
+  }.join("\n")
+
   fluentd_conf = <<-EOS
 type datadog
 dd_api_key #{dd_api_key}
 host #{host}
+#{additional_options}
   EOS
 
   tag = options[:tag] || 'test.default'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara
@@ -14,28 +14,28 @@ dependencies:
   name: fluentd
   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: dogapi
   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
@@ -56,28 +56,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
 description: Output plugin for Datadog
@@ -107,20 +107,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Output plugin for Datadog
 test_files:
 - spec/out_dd_spec.rb
 - spec/spec_helper.rb
+has_rdoc: