logstash-output-graphite 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d81ae345bb7111180cfe98d22c1888a77a4e29d
-  data.tar.gz: 890db2c2367b1a3df8adf07a6a756bd137c37427
+  metadata.gz: 43878fb6306207fac8b8dc188489cbabbe6ec7ff
+  data.tar.gz: f3a78ec1f7647830bf35e708853165f9a2c5719a
 SHA512:
-  metadata.gz: ff17bb29767131ca8730b6a2f20b759e9ba4ea783d581adb4dac990c765d92313be448661b0df9b845ba6e08b97c904e7cbf741f68f31d5e15b81b0a4309a23b
-  data.tar.gz: 6f020b96aa814bffaa7980fd27dc95ab8241998de255ab1dc6acb81825ebe4a4f47cd5c2603e91da4f638fdd026015c6d9fc600d23f63d900154911b90c5fd76
+  metadata.gz: 829ddb59da8be6fc592b90d8b67856520adaeb214a61fe4af86b17a03f79325b4d3911522c71a2b94c15a385734008a0917b3bd6ee795e76f4fe447fce9a0ca5
+  data.tar.gz: 26ee32f6ec304f17622f646c72c05ef924acbaf3dff76dde7363267bff9df035f5c37cc670eb7fb5ab2f0948a04808f6bf0866a90ea5fb6172a0781bf228626a

data/logstash-output-graphite.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-graphite'
-  s.version         = '0.1.1'
+  s.version         = '0.1.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output allows you to pull metrics from your logs and ship them to Graphite"
   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"
@@ -23,5 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logstash', '>= 1.4.0', '< 2.0.0'
 
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'logstash-input-generator'
+  s.add_development_dependency 'logstash-filter-kv'
 end
 

data/spec/outputs/graphite_spec.rb

@@ -1,14 +1,10 @@
-require "logstash/devutils/rspec/spec_helper"
-require "logstash/outputs/graphite"
-require "mocha/api"
+require_relative '../spec_helper'
 
-describe LogStash::Outputs::Graphite, :socket => true do
-  
+describe LogStash::Outputs::Graphite do
 
-  describe "defaults should include all metrics" do
-    port = 4939
-    config <<-CONFIG
-      input {
+  let(:port) { 4939 }
+  let(:config) do <<-CONFIG
+     input {
         generator {
           message => "foo=fancy bar=42"
           count => 1
@@ -27,36 +23,39 @@ describe LogStash::Outputs::Graphite, :socket => true do
           metrics => [ "hurray.%{foo}", "%{bar}" ]
         }
       }
-    CONFIG
-
-    let(:queue) { Queue.new }
-    before :each do
-      server = TCPServer.new("127.0.0.1", port)
-      Thread.new do
-        client = server.accept
-        p client
-        while true
-          p :read
-          line = client.readline
-          p :done
-          queue << line
-          p line
-        end
-      end
-    end
+  CONFIG
+  end
+
+  let(:pipeline) { LogStash::Pipeline.new(config) }
+  let(:server)   { Mocks::Server.new(port) }
+
+  before do
+    server.start
+    pipeline.run
+  end
+
+  after do
+    server.stop
+  end
 
-    agent do
-      lines = queue.pop
+  context "with a default run" do
 
-      insist { lines.size } == 1
-      insist { lines }.any? { |l| l =~ /^hurray.fancy 42.0 \d{10,}\n$/ }
+    it "generate one element" do
+      expect(server.size).to eq(1)
     end
+
+    it "include all metrics" do
+      lines = server.pop
+      expect(lines).to match(/^hurray.fancy 42.0 \d{10,}\n$/)
+    end
+
   end
 
-  describe "fields_are_metrics => true" do
-    describe "metrics_format => ..." do
-      describe "match one key" do
-        config <<-CONFIG
+  context "if fields_are_metrics => true" do
+    context "when metrics_format => ..." do
+
+      context "match one key" do
+        let(:config) do <<-CONFIG
           input {
             generator {
               message => "foo=123"
@@ -72,7 +71,7 @@ describe LogStash::Outputs::Graphite, :socket => true do
           output {
             graphite {
                 host => "localhost"
-                port => 2003
+                port => #{port}
                 fields_are_metrics => true
                 include_metrics => ["foo"]
                 metrics_format => "foo.bar.sys.data.*"
@@ -80,17 +79,22 @@ describe LogStash::Outputs::Graphite, :socket => true do
             }
           }
         CONFIG
+        end
+
+        it "generate one element" do
+          expect(server.size).to eq(1)
+        end
 
-        agent do
-          @mock.rewind
-          lines = @mock.readlines
-          insist { lines.size } == 1
-          insist { lines[0] } =~ /^foo.bar.sys.data.foo 123.0 \d{10,}\n$/
+        it "match the generated key" do
+          lines = server.pop
+          expect(lines).to match(/^foo.bar.sys.data.foo 123.0 \d{10,}\n$/)
         end
+
       end
 
-      describe "match all keys" do
-        config <<-CONFIG
+      context "match all keys" do
+
+        let(:config) do <<-CONFIG
           input {
             generator {
               message => "foo=123 bar=42"
@@ -106,7 +110,7 @@ describe LogStash::Outputs::Graphite, :socket => true do
           output {
             graphite {
                 host => "localhost"
-                port => 2003
+                port => #{port}
                 fields_are_metrics => true
                 include_metrics => [".*"]
                 metrics_format => "foo.bar.sys.data.*"
@@ -114,19 +118,31 @@ describe LogStash::Outputs::Graphite, :socket => true do
             }
           }
         CONFIG
+        end
+
+        let(:lines) do
+          dict = {}
+          while(!server.empty?)
+            line = server.pop
+            key  = line.split(' ')[0]
+            dict[key] = line
+          end
+          dict
+        end
 
-        agent do
-          @mock.rewind
-          lines = @mock.readlines.delete_if { |l| l =~ /\.sequence \d+/ }
+        it "match the generated foo key" do
+          expect(lines['foo.bar.sys.data.foo']).to match(/^foo.bar.sys.data.foo 123.0 \d{10,}\n$/)
+        end
 
-          insist { lines.size } == 2
-          insist { lines }.any? { |l| l =~ /^foo.bar.sys.data.foo 123.0 \d{10,}\n$/ }
-          insist { lines }.any? { |l| l =~ /^foo.bar.sys.data.bar 42.0 \d{10,}\n$/ }
+        it "match the generated bar key" do
+          expect(lines['foo.bar.sys.data.bar']).to match(/^foo.bar.sys.data.bar 42.0 \d{10,}\n$/)
         end
+
       end
 
-      describe "no match" do
-        config <<-CONFIG
+      context "no match" do
+
+        let(:config) do  <<-CONFIG
           input {
             generator {
               message => "foo=123 bar=42"
@@ -142,7 +158,7 @@ describe LogStash::Outputs::Graphite, :socket => true do
           output {
             graphite {
               host => "localhost"
-              port => 2003
+              port => #{port}
               fields_are_metrics => true
               include_metrics => ["notmatchinganything"]
               metrics_format => "foo.bar.sys.data.*"
@@ -150,16 +166,16 @@ describe LogStash::Outputs::Graphite, :socket => true do
             }
           }
         CONFIG
+        end
 
-        agent do
-          @mock.rewind
-          lines = @mock.readlines
-          insist { lines.size } == 0
+        it "generate no event" do
+          expect(server.empty?).to be_true
         end
       end
 
-      describe "match one key with invalid metric_format" do
-        config <<-CONFIG
+      context "match a key with invalid metric_format" do
+
+        let(:config) do <<-CONFIG
           input {
             generator {
               message => "foo=123"
@@ -175,7 +191,7 @@ describe LogStash::Outputs::Graphite, :socket => true do
           output {
             graphite {
                 host => "localhost"
-                port => 2003
+                port => #{port}
                 fields_are_metrics => true
                 include_metrics => ["foo"]
                 metrics_format => "invalidformat"
@@ -183,21 +199,21 @@ describe LogStash::Outputs::Graphite, :socket => true do
             }
           }
         CONFIG
+        end
 
-        agent do
-          @mock.rewind
-          lines = @mock.readlines
-          insist { lines.size } == 1
-          insist { lines[0] } =~ /^foo 123.0 \d{10,}\n$/
+        it "match the foo key" do
+          lines = server.pop
+          expect(lines).to match(/^foo 123.0 \d{10,}\n$/)
         end
       end
     end
   end
 
-  describe "fields are metrics = false" do
-    describe "metrics_format not set" do
-      describe "match one key with metrics list" do
-        config <<-CONFIG
+  context "fields are metrics = false" do
+    context "metrics_format not set" do
+      context "match one key with metrics list" do
+
+        let(:config) do <<-CONFIG
           input {
             generator {
               message => "foo=123"
@@ -213,7 +229,7 @@ describe LogStash::Outputs::Graphite, :socket => true do
           output {
             graphite {
                 host => "localhost"
-                port => 2003
+                port => #{port}
                 fields_are_metrics => false
                 include_metrics => ["foo"]
                 metrics => [ "custom.foo", "%{foo}" ]
@@ -221,16 +237,15 @@ describe LogStash::Outputs::Graphite, :socket => true do
             }
           }
         CONFIG
+        end
 
-        agent do
-          @mock.rewind
-          lines = @mock.readlines
-
-          insist { lines.size } == 1
-          insist { lines[0] } =~ /^custom.foo 123.0 \d{10,}\n$/
+        it "match the custom.foo key" do
+          lines = server.pop
+          expect(lines).to match(/^custom.foo 123.0 \d{10,}\n$/)
         end
-      end
 
+      end
     end
   end
+
 end

data/spec/server.rb

@@ -0,0 +1,39 @@
+module Mocks
+  class Server
+
+    def initialize(port)
+      @queue = Queue.new
+      @port  = port
+    end
+
+    def start
+      @server = TCPServer.new("127.0.0.1", @port)
+      @queue.clear
+      Thread.new do
+        client = @server.accept
+        while true
+          line = client.readline
+          @queue << line
+        end
+      end
+      self
+    end
+
+    def size
+      @queue.length
+    end
+
+    def pop
+      @queue.pop
+    end
+
+    def stop
+      @server.close
+    end
+
+    def empty?
+      @queue.empty?
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/outputs/graphite"
+require_relative "server"

metadata

@@ -1,16 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-graphite
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -19,31 +28,50 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: logstash-input-generator
+  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-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-filter-kv
   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@elasticsearch.com
 executables: []
@@ -57,6 +85,8 @@ files:
 - lib/logstash/outputs/graphite.rb
 - logstash-output-graphite.gemspec
 - spec/outputs/graphite_spec.rb
+- spec/server.rb
+- spec/spec_helper.rb
 homepage: http://www.elasticsearch.org/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -85,3 +115,5 @@ specification_version: 4
 summary: This output allows you to pull metrics from your logs and ship them to Graphite
 test_files:
 - spec/outputs/graphite_spec.rb
+- spec/server.rb
+- spec/spec_helper.rb