logstash-input-graphite 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68b5e8b8bbcc5a4692f9eba8d36526fecbb9fcb4
-  data.tar.gz: 32ff917195721a3088d13eadfaff77bdfbd31c89
+  metadata.gz: 5f5a55f6d8be2888ade12a770059967edc2775d7
+  data.tar.gz: dc31a79474dfa2772cdf890fb1f5b9ffdfae1730
 SHA512:
-  metadata.gz: 006db2dc27209fbadda2e9e7f5a8cbf586863d4840e7e2b563768d19db69cbf35728530961059e4e39229a3350c212d01757330d9d073d84349dd8e175b356d3
-  data.tar.gz: 7442f83a63d45a352758fe8b8e032ff44e4990dc4873b1d18ad1a77eeaaccaa83a55bdd44e3ca73a26289dd61924c13bb96d04a7a749d09c83b808aa6cfc9502
+  metadata.gz: 0a78ab75b268e6522ee48a5560ced4ee56077498772c2226f69adb4540283af8a014fca6971d10718bbe681c828b6b12362ca78a9d457a66b632bd2655ce2cbf
+  data.tar.gz: 21b4e79616d9531da9cee6dad53ea654e21b5b78054cebd022754b7caf024ec72468ca853d1f0844761530dfa2eb3c746a52a6057d3d1b0a853479fc77105747

data/CHANGELOG.md

@@ -1,5 +1,6 @@
+## 2.0.2
+ - added comments and basic specs
 ## 2.0.0
- - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
- - Dependency on logstash-core update to 2.0
-
+ - Dependency on logstash-core update to 2.0

data/lib/logstash/inputs/graphite.rb

@@ -21,6 +21,8 @@ class LogStash::Inputs::Graphite < LogStash::Inputs::Tcp
   public
   def run(output_queue)
     @queue = output_queue
+    # pass self as output_queue to super Tcp#run - this is a hack so that the << calls in
+    # Tcp will actually call the << method defined below. This is twisted :P
     super(self)
   end
 

data/logstash-input-graphite.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-graphite'
-  s.version         = '2.0.1'
+  s.version         = '2.0.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Receive graphite metrics"
   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"

data/spec/inputs/graphite_spec.rb

@@ -1 +1,76 @@
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/inputs/graphite"
+require "logstash/timestamp"
+require "time"
+require_relative "../spec_helper"
+
+describe LogStash::Inputs::Graphite do
+
+  before do
+    srand(RSpec.configuration.seed)
+  end
+
+  let(:host) { "127.0.0.1" }
+  let(:port) { rand(1024..65535) }
+  let(:queue) { [] }
+  let(:client) { Stud::try(5.times) { TCPSocket.new(host, port) } }
+  let!(:helper) { TcpHelpers.new }
+
+  subject { LogStash::Inputs::Graphite.new("host" => host, "port" => port) }
+
+  after :each do
+    subject.close rescue nil
+  end
+
+  describe "register" do
+    it "should register without errors" do
+      expect { subject.register }.to_not raise_error
+    end
+  end
+
+  describe "receive" do
+
+    before(:each) do
+      subject.register
+    end
+
+    it "should parse a graphite message" do
+      result = helper.pipelineless_input(subject, 1) do
+        client.write "a.b.c 10 N\n"
+      end
+      expect(result.size).to eq(1)
+      expect(result.first.to_hash).to include({"a.b.c" => 10})
+    end
+
+    it "should parse a graphite message with floats" do
+      result = helper.pipelineless_input(subject, 1) do
+        client.write "a.b.c 10.2 N\n"
+      end
+      expect(result.size).to eq(1)
+      expect(result.first.to_hash).to include({"a.b.c" => 10.2})
+    end
+
+    it "should support using N as current timestamp" do
+      time = LogStash::Timestamp.new(Time.now)
+      expect(Time).to receive(:now) { time }
+      result = helper.pipelineless_input(subject, 1) do
+        client.write "a.b.c 10 N\n"
+      end
+      expect(result.size).to eq(1)
+      expect(result.first["@timestamp"]).to eq(time)
+    end
+
+    it "should support using N as current timestamp" do
+      time = Time.at(Time.now.to_i) # truncate at the second
+      result = helper.pipelineless_input(subject, 1) do
+        client.write "a.b.c 10 #{time.to_i}\n"
+      end
+      expect(result.size).to eq(1)
+      expect(result.first["@timestamp"]).to eq(LogStash::Timestamp.new(time))
+    end
+  end
+
+  it_behaves_like "an interruptible input plugin" do
+    let(:config) { { "port" => port } }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+
+# this has been taken from the udp input, it should be DRYed
+
+class TcpHelpers
+
+  def pipelineless_input(plugin, size, &block)
+    queue = Queue.new
+    input_thread = Thread.new do
+      plugin.run(queue)
+    end
+    block.call
+    sleep 0.1 while queue.size != size
+    result = size.times.inject([]) do |acc|
+      acc << queue.pop
+    end
+    plugin.do_stop
+    input_thread.join
+    result
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-graphite
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Elastic
@@ -11,7 +11,8 @@ cert_chain: []
 date: 2015-10-08 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: 3.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,49 +28,52 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-input-tcp
+  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'
-  name: logstash-input-tcp
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   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-devutils
   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@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/logstash/inputs/graphite.rb
+- spec/spec_helper.rb
+- spec/inputs/graphite_spec.rb
+- logstash-input-graphite.gemspec
 - CHANGELOG.md
+- README.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
-- README.md
-- lib/logstash/inputs/graphite.rb
-- logstash-input-graphite.gemspec
-- spec/inputs/graphite_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -95,9 +96,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Receive graphite metrics
 test_files:
+- spec/spec_helper.rb
 - spec/inputs/graphite_spec.rb