logstash-output-influxdb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cc68a17de279613d432626ba7ccdbce2fa8e445
-  data.tar.gz: 30d788bd3a7f024874ddead39c3592a2c604c688
+  metadata.gz: b6f61107587eab684af48a9435abdf68f73bfca5
+  data.tar.gz: 06bad73341f74d379316ec90654d6d5b78e7349c
 SHA512:
-  metadata.gz: 85583ba2553dd8c8c652c3b44ab6472992d5ef63ce255c5a328729ea645dc14e3090e191ca918d2f0cc0fee39870bbdbaa9d1ba2446e8508c113fc5f458549a8
-  data.tar.gz: 63495322a20ef7166317e3531b713683a6b7f7fa3050e84c6b3885500b70a64feffa7927057af8e184d022e95e6d6cb04bdee0cb745451d4526d1a2ce3b8fa0d
+  metadata.gz: 52530dbc46948873507fb1525826e3e805d641ef355c84ae8116e880479f908376c476e7bbbd60de31556f2fe0c8b6e7ddb17ac6bbab273eab663c98785812e5
+  data.tar.gz: c6d1e37d7948f87179827a4d87ead5294ba6f964fa0291ba05c5a931acf825390e040b0c7a7d758fb05c3b239d7843152efbcae708f4d719117bb17bc12deb24

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 Elasticsearch <http://www.elasticsearch.org>
+Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/logstash/outputs/influxdb.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
+require "logstash/json"
 require "stud/buffer"
 
 # This output lets you output Metrics to InfluxDB
@@ -93,14 +94,14 @@ class LogStash::Outputs::InfluxDB < LogStash::Outputs::Base
     @query_params = "u=#{@user}&p=#{@password.value}&time_precision=#{@time_precision}"
     @base_url = "http://#{@host}:#{@port}/db/#{@db}/series"
     @url = "#{@base_url}?#{@query_params}"
-    
+
     buffer_initialize(
       :max_items => @flush_size,
       :max_interval => @idle_flush_time,
       :logger => @logger
     )
   end # def register
-  
+
   public
   def receive(event)
     return unless output?(event)
@@ -125,21 +126,26 @@ class LogStash::Outputs::InfluxDB < LogStash::Outputs::Base
     # ]
     event_hash = {}
     event_hash['name'] = event.sprintf(@series)
+
     sprintf_points = Hash[@data_points.map {|k,v| [event.sprintf(k), event.sprintf(v)]}]
     if sprintf_points.has_key?('time')
-      @logger.error("Cannot override value of time without 'allow_override_time'. Using event timestamp") unless @allow_override_time
+      unless @allow_time_override
+        logger.error("Cannot override value of time without 'allow_time_override'. Using event timestamp")
+        sprintf_points['time'] = event.timestamp.to_i
+      end
     else
       sprintf_points['time'] = event.timestamp.to_i
     end
+
     @coerce_values.each do |column, value_type|
       if sprintf_points.has_key?(column)
         begin
           case value_type
           when "integer"
-            @logger.debug("Converting column #{column} to type #{value_type}: Current value: #{sprintf_points[column]}")
+            @logger.debug? and @logger.debug("Converting column #{column} to type #{value_type}: Current value: #{sprintf_points[column]}")
             sprintf_points[column] = sprintf_points[column].to_i
           when "float"
-            @logger.debug("Converting column #{column} to type #{value_type}: Current value: #{sprintf_points[column]}")
+            @logger.debug? and @logger.debug("Converting column #{column} to type #{value_type}: Current value: #{sprintf_points[column]}")
             sprintf_points[column] = sprintf_points[column].to_f
           else
             @logger.error("Don't know how to convert to #{value_type}")
@@ -149,17 +155,15 @@ class LogStash::Outputs::InfluxDB < LogStash::Outputs::Base
         end
       end
     end
+
     event_hash['columns'] = sprintf_points.keys
     event_hash['points'] = []
     event_hash['points'] << sprintf_points.values
+
     buffer_receive(event_hash)
   end # def receive
 
-#  def flush; return; end
-  def flush(events, teardown=false)
-   # Avoid creating a new string for newline every time
-    newline = "\n".freeze
-
+  def flush(events, teardown = false)
     # seen_series stores a list of series and associated columns
     # we've seen for each event
     # so that we can attempt to batch up points for a given series.
@@ -181,13 +185,13 @@ class LogStash::Outputs::InfluxDB < LogStash::Outputs::Base
           seen_series[ev['name']] = ev['columns']
           event_collection << ev
         end
-      rescue
-        @logger.info("Error adding event to collection", :exception => e)
+      rescue => e
+        @logger.warn("Error adding event to collection", :exception => e)
         next
       end
     end
 
-    post(event_collection.to_json)
+    post(LogStash::Json.dump(event_collection))
   end # def receive_bulk
 
   def post(body)

data/logstash-output-influxdb.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-influxdb'
-  s.version         = '0.1.3'
+  s.version         = '0.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output lets you output Metrics to InfluxDB"
   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"
-  s.authors         = ["Elasticsearch"]
-  s.email           = 'info@elasticsearch.com'
-  s.homepage        = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
+  s.authors         = ["Elastic"]
+  s.email           = 'info@elastic.co'
+  s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
   s.require_paths = ["lib"]
 
   # Files
@@ -26,5 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'ftw', ['~> 0.0.40']
 
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'logstash-input-generator'
+  s.add_development_dependency 'logstash-filter-kv'
 end
 

data/spec/outputs/influxdb_spec.rb

@@ -1 +1,43 @@
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/outputs/influxdb"
+
+describe LogStash::Outputs::InfluxDB do
+
+  let(:pipeline) { LogStash::Pipeline.new(config) }
+
+  context "complete pipeline run with 2 events" do
+
+    let(:config) do <<-CONFIG
+       input {
+          generator {
+            message => "foo=1 bar=2 time=3"
+            count => 2
+            type => "generator"
+          }
+        }
+
+        filter {
+          kv { }
+        }
+
+        output {
+          influxdb {
+            host => "localhost"
+            user => "someuser"
+            password => "somepwd"
+            allow_time_override => true
+            data_points => {"foo" => "%{foo}" "bar" => "%{bar}" "time" => "%{time}"}
+          }
+        }
+      CONFIG
+    end
+
+    let(:json_result) { "[{\"name\":\"logstash\",\"columns\":[\"foo\",\"bar\",\"time\"],\"points\":[[\"1\",\"2\",\"3\"],[\"1\",\"2\",\"3\"]]}]" }
+
+    it "should receive 2 events, flush and call post with 2 items json array" do
+      expect_any_instance_of(LogStash::Outputs::InfluxDB).to receive(:post).with(json_result)
+      pipeline.run
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
-- Elasticsearch
+- Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -72,8 +72,36 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-input-generator
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-filter-kv
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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@elasticsearch.com
+email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -87,7 +115,7 @@ files:
 - lib/logstash/outputs/influxdb.rb
 - logstash-output-influxdb.gemspec
 - spec/outputs/influxdb_spec.rb
-homepage: http://www.elasticsearch.org/guide/en/logstash/current/index.html
+homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
 metadata:
@@ -109,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: This output lets you output Metrics to InfluxDB