logstash-output-datadog_metrics 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db9af8d3ccb0aa36d804f9bbd7d28868a083b65
-  data.tar.gz: 9cc5ff64502a22a00023be9f4235e5ec323a636e
+  metadata.gz: b2fff9b69ded858abede9d1a806c1d452468070f
+  data.tar.gz: 6c8f8901fd704553ff0d71ba9edde9e33aaa23e2
 SHA512:
-  metadata.gz: b7e00c2a8f1647b32e3bbad1e16460c803aa7e2b15e022b056c062539f451019b7046b4c68a98e9a071b43674eda8c75569e6899d18869310302529620f7e4e8
-  data.tar.gz: ddfdcd8eef787082d991bb4ca7867aeb96b1348f5549b26c4dcb2f909d4e5a8628c197d695caa68e552305691656b551bbeb0badde5c515df9adf6a66e3d5fe9
+  metadata.gz: 8a36d244ccff5ec85ce4961b874d96e2572f13443f922365e9852bc73246c67b6ce48db1f22db14ce2fa1e7190c77a74eee25de2385a373159ba6b13cf3e4449
+  data.tar.gz: 760bf4fa251879d738f1fb39020f36eb4024cfcbb6ef9de7f53f291ed446c944997a76bc297c4923d14134504a5f4e1cb6fa63439fb4a413ba60ffda8234dca6

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.1.5
+ - use new Json and Timestamp API
+ - better coersion of the event.timestamp: can be Time, Timestamp or String

data/CONTRIBUTORS

@@ -10,6 +10,7 @@ Contributors:
 * Kurt Hurtado (kurtado)
 * Pier-Hugues Pellerin (ph)
 * Richard Pijnenburg (electrical)
+* Guy Boertje (guyboertje)
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/NOTICE.TXT

@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2012-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).

data/README.md

@@ -1,19 +1,19 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com mailing list.
+Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/outputs/datadog_metrics.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
+require "logstash/json"
 require "stud/buffer"
 
 
@@ -9,8 +10,7 @@ require "stud/buffer"
 
 # Default `queue_size` and `timeframe` are low in order to provide near realtime alerting.
 # If you do not use Datadog for alerting, consider raising these thresholds.
-
-class LogStash::Outputs::DatadogMetrics < LogStash::Outputs::Base
+module LogStash module Outputs class DatadogMetrics < LogStash::Outputs::Base
 
   include Stud::Buffer
 
@@ -46,8 +46,8 @@ class LogStash::Outputs::DatadogMetrics < LogStash::Outputs::Base
   config :timeframe, :validate => :number, :default => 10
 
   public
+
   def register
-    require 'time'
     require "net/https"
     require "uri"
 
@@ -64,7 +64,7 @@ class LogStash::Outputs::DatadogMetrics < LogStash::Outputs::Base
     )
   end # def register
 
-  public
+  # public
   def receive(event)
     return unless output?(event)
     return unless @metric_name && @metric_value && @metric_type
@@ -88,24 +88,15 @@ class LogStash::Outputs::DatadogMetrics < LogStash::Outputs::Base
     buffer_receive(dd_metrics)
   end # def receive
 
-  public
+  # public
   def flush(events, final=false)
     dd_series = Hash.new
-    dd_series['series'] = []
-
-    events.each do |event|
-      begin
-        dd_series['series'] << event
-      rescue
-        @logger.warn("Error adding event to series!", :exception => e)
-        next
-      end
-    end
+    dd_series['series'] = Array(events).flatten
 
     request = Net::HTTP::Post.new("#{@uri.path}?api_key=#{@api_key}")
 
     begin
-      request.body = dd_series.to_json
+      request.body = series_to_json(dd_series)
       request.add_field("Content-Type", 'application/json')
       response = @client.request(request)
       @logger.info("DD convo", :request => request.inspect, :response => response.inspect)
@@ -116,8 +107,13 @@ class LogStash::Outputs::DatadogMetrics < LogStash::Outputs::Base
   end # def flush
 
   private
+
+  def series_to_json(series)
+    LogStash::Json.dump(series)
+  end
+
   def to_epoch(t)
-    return t.is_a?(Time) ? t.to_i : Time.parse(t).to_i
-  end # def to_epoch
+    Integer(t.is_a?(String) ? Time.parse(t) : t)
+  end
 
-end # class LogStash::Outputs::DatadogMetrics
+end end end # class LogStash::Outputs::DatadogMetrics

data/logstash-output-datadog_metrics.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-datadog_metrics'
-  s.version         = '0.1.4'
+  s.version         = '0.1.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output lets you send metrics to DataDogHQ based on Logstash events."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-codec-plain", '>= 1.0.0'
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/outputs/datadog_metrics_spec.rb

@@ -1 +1,86 @@
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/outputs/datadog_metrics"
+
+describe LogStash::Outputs::DatadogMetrics do
+  let(:http_instance) { double('net_http_instance') }
+  let(:request) { double('net_http_request') }
+  let(:response) { double('net_http_response') }
+
+  let(:json_obj) { double('json_obj') }
+  let(:logger) { double('logger') }
+  let(:ddtags) { ['foo', 'bar'] }
+  let(:event_hash) do
+    {
+      'message' => 'Hello world!',
+      'source' => 'datadog-metrics',
+      'type' => 'generator',
+      'host' => 'localhost',
+      '@timestamp' => LogStash::Timestamp.now
+    }
+  end
+  let(:event)  { LogStash::Event.new(event_hash) }
+  let(:params) do
+    {
+      'api_key' => '123456789',
+      'dd_tags' => ddtags,
+      'metric_type' => 'gauge'
+    }
+  end
+
+  before do
+    allow(Net::HTTP).to receive(:new).and_return(http_instance)
+    allow(Net::HTTP::Post).to receive(:new).and_return(request)
+  end
+
+  subject { described_class.new(params) }
+
+  context 'construction' do
+    it 'register method calls collaborator methods' do
+      expect(http_instance).to receive(:use_ssl=)
+      expect(http_instance).to receive(:verify_mode=)
+      subject.register
+      buffer = subject.instance_variable_get(:@buffer_config)
+      expect(buffer[:max_items]).to be 10
+    end
+  end
+
+  context 'runtime' do
+    before do
+      allow(http_instance).to receive(:use_ssl=)
+      allow(http_instance).to receive(:verify_mode=)
+      subject.register
+    end
+
+    context 'receiving an event' do
+      it 'receives' do
+        subject.receive(event)
+        buffer = subject.instance_variable_get(:@buffer_state)
+        expect(buffer[:pending_items].inspect).to match(/"tags"=>\["foo", "bar"\]/)
+      end
+    end
+
+    context 'flushing multiple events' do
+      before do
+        series_hash = {'series' => Array(event)}
+        subject.instance_variable_set(:@logger, logger)
+        expect(LogStash::Json).to receive(:dump).with(series_hash).and_return('---')
+        expect(request).to receive(:body=)
+        expect(request).to receive(:add_field)
+        expect(logger).to receive(:info).at_least(:once)
+        expect(logger).not_to receive(:warn)
+        expect(http_instance).to receive(:request).with(request).and_return(response)
+
+        expect(response).to receive(:code).and_return('202')
+      end
+
+      it 'flushes final=false [final is unused]' do
+        expect{subject.flush([event], false)}.not_to raise_error
+      end
+
+      it 'flushes final=true [final is unused]' do
+        expect{subject.flush([event], true)}.not_to raise_error
+      end
+    end
+  end
+
+end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-datadog_metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,20 +28,36 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  name: logstash-devutils
+        version: 1.0.0
   prerelease: false
-  type: :development
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
@@ -51,9 +65,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
+- NOTICE.TXT
 - README.md
 - Rakefile
 - lib/logstash/outputs/datadog_metrics.rb