fluent-plugin-dd 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8abcfb0fc04ae21036b74510e140eb471c583ec1
-  data.tar.gz: bb1cd7f2340cb5d14a5fcafed9ab58d13923afd0
+  metadata.gz: a97e3d33021af7a03dc9bd0ae1f2431332260e03
+  data.tar.gz: 4bd8cb8de1663d893aac826f08bd1d314ca30add
 SHA512:
-  metadata.gz: 0be3eeb5ba3ee78de16a52c597031d4ee943771bed50743f6ccf60a8058f1e0077a40742ea9efa09e4fd693326a71afbae55a7d250920eca807ada8fb6db49a3
-  data.tar.gz: 0235abf277ff35648cfdcbff3a05219a78cfa1c147a0bc1eb144c57aae27ad5a5938cd9711f7fbd9bd14599d9c8a5ecd205ea7e809ff07a8673ee985fd0944a1
+  metadata.gz: 2e9402d2f8ba77fbb235a2406680139e05e77b2f8ceaf570811ef616fc44e4b5cdb3c3edeaf31bec1fef2566f0b1723800983489b49e9c2bbdef5573e5ae24a2
+  data.tar.gz: 58c07c32af366a4eea8087443a39f58c43e7c740a1f9f7f26e4babe771a63f6273d216fa3569425fb575b3fb287fee77853dfd9c258267b676fe80ffde6e2230

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+- 2.0.0
+script:
+- bundle install
+- bundle exec rake

data/README.md

@@ -2,8 +2,8 @@
 
 Output plugin for Datadog
 
-[![Gem Version](https://badge.fury.io/rb/fluent-plugin-dd.png)](http://badge.fury.io/rb/fluent-plugin-dd)
-[![Build Status](https://drone.io/bitbucket.org/winebarrel/fluent-plugin-dd/status.png)](https://drone.io/bitbucket.org/winebarrel/fluent-plugin-dd/latest)
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-dd.svg)](http://badge.fury.io/rb/fluent-plugin-dd)
+[![Build Status](https://travis-ci.org/winebarrel/fluent-plugin-dd.svg?branch=master)](https://travis-ci.org/winebarrel/fluent-plugin-dd)
 
 ## Installation
 
@@ -15,7 +15,11 @@ Output plugin for Datadog
 <match datadog.**>
   type dd
   dd_api_key ...
+  #dd_app_key_key ...
   #host my_host.example.com
+  #device my_device
+  #silent true
+  #timeout 5
   #use_fluentd_tag_for_datadog_tag false
   #emit_in_background false
 </match>
@@ -25,7 +29,7 @@ Output plugin for Datadog
 
 ```sh
 echo '{"metric":"some.metric.name", "value":50.0}' | fluent-cat datadog.metric
-echo '{"metric":"some.metric.name", "value":100.0, "tag":"any.tag", "host":"any.host", "type":"gauge"}' | fluent-cat datadog.metric
+echo '{"metric":"some.metric.name", "value":100.0, "tag":"any.tag", "host":"any.host", "type":"gauge", "device":"my_device"}' | fluent-cat datadog.metric
 ```
 
 ## Contributing

data/fluent-plugin-dd.gemspec

@@ -1,12 +1,12 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-dd'
-  spec.version       = '0.1.5'
+  spec.version       = '0.1.6'
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
   spec.description   = %q{Output plugin for Datadog}
   spec.summary       = %q{Output plugin for Datadog}
-  spec.homepage      = 'https://bitbucket.org/winebarrel/fluent-plugin-dd'
+  spec.homepage      = 'https://github.com/winebarrel/fluent-plugin-dd'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'fluentd'
-  spec.add_dependency 'dogapi'
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_dependency 'dogapi', '>= 1.10.0'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 2.11.0'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
 end

data/lib/fluent/plugin/out_dd.rb

@@ -6,7 +6,11 @@ class Fluent::DdOutput < Fluent::BufferedOutput
   end
 
   config_param :dd_api_key, :string
+  config_param :dd_app_key, :string, :default => nil
   config_param :host, :string, :default => nil
+  config_param :device, :string, :default => nil
+  config_param :silent, :bool, :default => true
+  config_param :timeout, :integer, :default => nil
   config_param :use_fluentd_tag_for_datadog_tag, :bool, :default => false
   config_param :emit_in_background, :bool, :default => false
   config_param :concurrency, :integer, :default => nil
@@ -65,7 +69,7 @@ class Fluent::DdOutput < Fluent::BufferedOutput
       @host = Socket.gethostname if @host.empty?
     end
 
-    @dog = Dogapi::Client.new(@dd_api_key, nil, @host)
+    @dog = Dogapi::Client.new(@dd_api_key, @dd_app_key, @host, @device, @silent, @timeout)
   end
 
   def format(tag, time, record)
@@ -106,9 +110,9 @@ class Fluent::DdOutput < Fluent::BufferedOutput
         dd_tag = tag
       end
 
-      [dd_tag] + record.values_at('metric', 'host', 'type')
+      [dd_tag] + record.values_at('metric', 'host', 'type', 'device')
     }.map {|i, records|
-      tag, metric, host, type = i
+      tag, metric, host, type, device = i
 
       points = records.map do |tag, time, record|
         time = Time.at(time)
@@ -120,6 +124,7 @@ class Fluent::DdOutput < Fluent::BufferedOutput
       options[:tags] = tag.split(',').map {|i| i.strip } if tag
       options[:host] = host if host
       options[:type] = type if type
+      options[:device] = device if device
 
       [metric, points, options]
     }

data/spec/out_dd_spec.rb

@@ -3,14 +3,39 @@ describe Fluent::DdOutput do
     Time.parse('2014-02-08 04:14:15 UTC').to_i
   }
 
+  it 'should load config' do
+    driver = Fluent::Test::OutputTestDriver.new(Fluent::DdOutput, 'test.default')
+
+    driver.configure(<<-EOS)
+      type dd
+      dd_api_key API_KEY
+      dd_app_key APP_KEY
+      host my_host.example.com
+      device my_device
+      silent false
+      timeout 5
+      use_fluentd_tag_for_datadog_tag true
+      emit_in_background true
+    EOS
+
+    expect(driver.instance.dd_api_key).to eq 'API_KEY'
+    expect(driver.instance.dd_app_key).to eq 'APP_KEY'
+    expect(driver.instance.host).to eq 'my_host.example.com'
+    expect(driver.instance.device).to eq 'my_device'
+    expect(driver.instance.silent).to eq false
+    expect(driver.instance.timeout).to eq 5
+    expect(driver.instance.use_fluentd_tag_for_datadog_tag).to eq true
+    expect(driver.instance.emit_in_background).to eq true
+  end
+
   it 'should receive an API key' do
-    Dogapi::Client.should_receive(:new).with("test_dd_api_key", nil, "test_host")
+    expect(Dogapi::Client).to receive(:new).with("test_dd_api_key", nil, "test_host", nil, true, nil)
     run_driver {|d, dog| }
   end
 
   it 'should be called emit_points' do
     run_driver do |d, dog|
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
@@ -33,7 +58,7 @@ describe Fluent::DdOutput do
 
     it 'should be called emit_points in the background' do
       run_driver(:emit_in_background => true) do |d, dog|
-        dog.should_receive(:emit_points).with(
+        expect(dog).to 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]],
@@ -50,12 +75,12 @@ describe Fluent::DdOutput do
         :emit_in_background => true,
         :concurrency => 2,
       ) do |d, dog|
-        dog.should_receive(:emit_points).with(
+        expect(dog).to receive(:emit_points).with(
           "some.metric.name.1",
           [[Time.parse("2014-02-08 04:14:15 UTC"), 50.0]],
           {}
         )
-        dog.should_receive(:emit_points).with(
+        expect(dog).to receive(:emit_points).with(
           "some.metric.name.2",
           [[Time.parse("2014-02-08 04:14:15 UTC"), 100.0]],
           {}
@@ -72,7 +97,7 @@ describe Fluent::DdOutput do
 
   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(
+      expect(dog).to 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]],
@@ -86,21 +111,21 @@ describe Fluent::DdOutput do
 
   it 'should be called emit_points for each tag' do
     run_driver(:use_fluentd_tag_for_datadog_tag => true) do |d, dog|
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
         {:tags=>["test.1"]}
       )
 
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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.2"]}
       )
 
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
@@ -123,21 +148,21 @@ describe Fluent::DdOutput do
 
   it 'should be called emit_points for each tag (tag is included in the record)' do
     run_driver do |d, dog|
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
         {:tags=>["test.11"]}
       )
 
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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.21"]}
       )
 
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
@@ -157,21 +182,21 @@ describe Fluent::DdOutput do
 
   it 'should be called emit_points with multiple tags' do
     run_driver do |d, dog|
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
         {:tags=>["test.12","test.13"]}
       )
 
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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.22","test.23"]}
       )
 
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
@@ -191,21 +216,21 @@ describe Fluent::DdOutput do
 
   it 'should be called emit_points for each host' do
     run_driver do |d, dog|
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
         {:host=>"www1.example.com"}
       )
 
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
         {:host=>"www2.example.com"}
       )
 
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
@@ -221,16 +246,48 @@ describe Fluent::DdOutput do
     end
   end
 
+  it 'should be called emit_points for each device' do
+    run_driver do |d, dog|
+      expect(dog).to 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]],
+        {:device=>"device1"}
+      )
+
+      expect(dog).to 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]],
+        {:device=>"device2"}
+      )
+
+      expect(dog).to 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]],
+        {:device=>"device3"}
+      )
+
+      d.emit({"metric" => "some.metric.name", "value" => 50.0, "device" => "device1"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 100.0, "device" => "device1"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 150.0, "device" => "device2"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 200.0, "device" => "device2"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 250.0, "device" => "device3"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 300.0, "device" => "device3"}, time)
+    end
+  end
+
   it 'should be called emit_points for each type' do
     run_driver do |d, dog|
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
         {:type=>"gauge"}
       )
 
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
@@ -246,7 +303,7 @@ describe Fluent::DdOutput do
 
   it 'should be skipped if `metric` key does not exists' do
     run_driver do |d, dog|
-      dog.should_receive(:emit_points).with(
+      expect(dog).to 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]],
@@ -254,9 +311,9 @@ describe Fluent::DdOutput do
       )
 
       log = d.instance.log
-      log.should_receive(:warn)
+      expect(log).to receive(:warn)
          .with('`metric` key does not exist: ["test.default", 1391832855, {"no metric"=>"some.metric.name", "value"=>51.0}]')
-      log.should_receive(:warn)
+      expect(log).to receive(:warn)
          .with('`metric` key does not exist: ["test.default", 1391832855, {"no metric"=>"some.metric.name", "value"=>101.0}]')
 
       d.emit({"no metric" => "some.metric.name", "value" => 51.0}, time)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dd
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.0.0
 description: Output plugin for Datadog
 email:
 - sugawara@cookpad.com
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,7 +98,7 @@ files:
 - lib/fluent/plugin/out_dd.rb
 - spec/out_dd_spec.rb
 - spec/spec_helper.rb
-homepage: https://bitbucket.org/winebarrel/fluent-plugin-dd
+homepage: https://github.com/winebarrel/fluent-plugin-dd
 licenses:
 - MIT
 metadata: {}
@@ -124,4 +125,3 @@ summary: Output plugin for Datadog
 test_files:
 - spec/out_dd_spec.rb
 - spec/spec_helper.rb
-has_rdoc: