logstash-input-couchdb_changes 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cec1015bb085e679dc5033cc661e358a0c6fa3a
-  data.tar.gz: 739401b666711fc39f05acd316a8642f719c4efb
+  metadata.gz: 622600b5454a2bdfdee79bf629696c8f33a35d25
+  data.tar.gz: 3d5d9889d441642874e4c14638fb3ea55642d4c3
 SHA512:
-  metadata.gz: 3efdcb1b88cae4999b14a4142acc102c2b969af06799ffa7c1a1a3a81b6231b3401c99ca2081f00477afc2c3036662dacc7f87b94b479db30664b989c35b2b98
-  data.tar.gz: 06fba2fdbe31fa7dcb46ebcb72612d6b2584a4b548d75dff7dc5c3c6b8404d86432b91cb410720ce470b8eeb07273791db824dc6248bef8df293929eeb2a8b9e
+  metadata.gz: 0358d2db602dca21f2f6b53a9d0f92fa200415c3a42c07c4f0a21fdabe1f303dad208424cf3931cc2cfd0d6a89b4bc819ce20ec6e08b2e90c4f15f4617e833a7
+  data.tar.gz: cbd99b5c738b723005aa7c7066c40c75615e095921f8737d3ef66eba832e7eae0d414d2b6bc326155c127a8b17911e047ebbe95e272d5532768d8d4f4b5510d0

data/lib/logstash/inputs/couchdb_changes.rb

@@ -5,13 +5,13 @@ require "logstash/namespace"
 require "net/http"
 require "uri"
 
-# This CouchDB input allows you to automatically stream events from the 
+# This CouchDB input allows you to automatically stream events from the
 # CouchDB http://guide.couchdb.org/draft/notifications.html[_changes] URI.
 # Moreover, any "future" changes will automatically be streamed as well making it easy to synchronize
 # your CouchDB data with any target destination
 #
 # ### Upsert and delete
-# You can use event metadata to allow for document deletion. 
+# You can use event metadata to allow for document deletion.
 # All non-delete operations are treated as upserts
 #
 # ### Starting at a Specific Sequence
@@ -33,21 +33,21 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
   # Connect to CouchDB's _changes feed securely (via https)
   # Default: false (via http)
   config :secure, :validate => :boolean, :default => false
-  
+
   # Path to a CA certificate file, used to validate certificates
   config :ca_file, :validate => :path
 
-  # Username, if authentication is needed to connect to 
+  # Username, if authentication is needed to connect to
   # CouchDB
   config :username, :validate => :string, :default => nil
 
-  # Password, if authentication is needed to connect to 
+  # Password, if authentication is needed to connect to
   # CouchDB
   config :password, :validate => :password, :default => nil
-  
+
   # Logstash connects to CouchDB's _changes with feed=continuous
   # The heartbeat is how often (in milliseconds) Logstash will ping
-  # CouchDB to ensure the connection is maintained.  Changing this 
+  # CouchDB to ensure the connection is maintained.  Changing this
   # setting is not recommended unless you know what you are doing.
   config :heartbeat, :validate => :number, :default => 1000
 
@@ -58,33 +58,33 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
   # If unspecified, Logstash will attempt to read the last sequence number
   # from the `sequence_path` file.  If that is empty or non-existent, it will
   # begin with 0 (the beginning).
-  # 
-  # If you specify this value, it is anticipated that you will 
+  #
+  # If you specify this value, it is anticipated that you will
   # only be doing so for an initial read under special circumstances
   # and that you will unset this value afterwards.
   config :initial_sequence, :validate => :number
-  
+
   # Preserve the CouchDB document revision "_rev" value in the
   # output.
   config :keep_revision, :validate => :boolean, :default => false
-  
-  # Future feature! Until implemented, changing this from the default 
+
+  # Future feature! Until implemented, changing this from the default
   # will not do anything.
   #
   # Ignore attachments associated with CouchDB documents.
   config :ignore_attachments, :validate => :boolean, :default => true
-  
+
   # Reconnect flag.  When true, always try to reconnect after a failure
   config :always_reconnect, :validate => :boolean, :default => true
-  
+
   # Reconnect delay: time between reconnect attempts, in seconds.
   config :reconnect_delay, :validate => :number, :default => 10
-  
+
   # Timeout: Number of milliseconds to wait for new data before
   # terminating the connection.  If a timeout is set it will disable
   # the heartbeat configuration option.
   config :timeout, :validate => :number
-  
+
   # Declare these constants here.
   FEED          = 'continuous'
   INCLUDEDOCS   = 'true'
@@ -114,14 +114,8 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
 
     @sequence = @initial_sequence ? @initial_sequence : @sequencedb.read
 
-    if @username && @password
-      @userinfo = @username + ':' + @password.value
-    else
-      @userinfo = nil
-    end
-    
   end
-  
+
   module SequenceDB
     class File
       def initialize(file)
@@ -138,14 +132,16 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
       end
     end
   end
-  
+
   public
   def run(queue)
     buffer = FileWatch::BufferedTokenizer.new
     @logger.info("Connecting to CouchDB _changes stream at:", :host => @host.to_s, :port => @port.to_s, :db => @db)
     uri = build_uri
     Net::HTTP.start(@host, @port, :use_ssl => (@secure == true), :ca_file => @ca_file) do |http|
+
       request = Net::HTTP::Get.new(uri.request_uri)
+      request.basic_auth(@username, @password.value) if @username && @password
       http.request request do |response|
         raise ArgumentError, "Database not found!" if response.code == "404"
         response.read_body do |chunk|
@@ -154,11 +150,11 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
             # sent as a sort of keep-alive.  We should ignore those.
             next if changes.chomp.empty?
             if event = build_event(changes)
-              @logger.debug("event", :event => event.to_hash_with_metadata) if @logger.debug? 
-              decorate(event) 
-              queue << event 
-              @sequence = event['@metadata']['seq'] 
-              @sequencedb.write(@sequence.to_s) 
+              @logger.debug("event", :event => event.to_hash_with_metadata) if @logger.debug?
+              decorate(event)
+              queue << event
+              @sequence = event['@metadata']['seq']
+              @sequencedb.write(@sequence.to_s)
             end
           end
         end
@@ -175,12 +171,12 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
     @logger.error("Unable to connect to database", :db => @db, :error => e.to_s)
     retry if reconnect?
   end
-  
+
   private
   def build_uri
     options = {:feed => FEED, :include_docs => INCLUDEDOCS, :since => @sequence}
     options = options.merge(@timeout ? {:timeout => @timeout} : {:heartbeat => @heartbeat})
-    URI::HTTP.build(:scheme => @scheme, :userinfo => @userinfo, :host => @host, :port => @port, :path => @path, :query => URI.encode_www_form(options))
+    URI::HTTP.build(:scheme => @scheme, :host => @host, :port => @port, :path => @path, :query => URI.encode_www_form(options))
   end
 
   private

data/logstash-input-couchdb_changes.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-couchdb_changes'
-  s.version         = '0.1.3'
+  s.version         = '0.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This input captures the _changes stream from a CouchDB instance"
-  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.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"
@@ -29,4 +29,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'logstash-output-elasticsearch'
 
 end
-

data/spec/inputs/couchdb_changes_spec.rb

@@ -5,6 +5,13 @@ require "logstash/json"
 require "logstash/inputs/couchdb_changes"
 
 module Helpers
+  USERNAME = "logstash"
+  PASSWORD = "logstash"
+
+  def auth
+    "#{USERNAME}:#{PASSWORD}@"
+  end
+
   def createdb
     ftw = FTW::Agent.new
     ftw.put!("http://127.0.0.1:5984/db")
@@ -66,15 +73,17 @@ module Helpers
 
   def createuser
     ftw = FTW::Agent.new
-    ftw.put!("http://127.0.0.1:5984/_config/admins/logstash", :body => '"logstash"')
+    ftw.put!("http://127.0.0.1:5984/_config/admins/#{USERNAME}", :body => "\"#{PASSWORD}\"")
   end
 
   def deleteuser
-    user = "logstash"
-    pass = "logstash"
-    auth = "#{user}:#{pass}@"
     ftw = FTW::Agent.new
-    ftw.delete!("http://#{auth}127.0.0.1:5984/_config/admins/logstash")
+    ftw.delete!("http://#{auth}127.0.0.1:5984/_config/admins/#{USERNAME}")
+  end
+
+  def addmember
+    ftw = FTW::Agent.new
+    ftw.put!("http://#{auth}127.0.0.1:5984/db/_security", :body => "{\"members\":{ \"names\":[\"#{USERNAME}\"]}}")
   end
 
   def deleteindex
@@ -98,7 +107,7 @@ module Helpers
     File.delete(sequence) if File.exist?(sequence)
   end
 end
-    
+
 describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
   describe "Load couchdb documents", :elasticsearch => true, :couchdb => true do
     include Helpers
@@ -132,7 +141,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       }
     }
     CONFIG
-      
+
     agent do
       # Verify the count
       ftw.post!("http://127.0.0.1:9200/#{index}/_refresh")
@@ -166,7 +175,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       teardown
     end
   end
-    
+
   describe "Test document updates", :elasticsearch => true, :couchdb => true do
     include Helpers
     sequence = "/tmp/.couchdb_seq"
@@ -200,7 +209,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       }
     }
     CONFIG
-      
+
     agent do
       # Verify the count (which should still be 10)
       ftw.post!("http://127.0.0.1:9200/#{index}/_refresh")
@@ -237,7 +246,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
     include Helpers
     sequence = "/tmp/.couchdb_seq"
     index = "couchdb_test"
-    
+
     ftw = FTW::Agent.new
 
     config <<-CONFIG
@@ -317,7 +326,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       buildup
       deletedoc # from CouchDB
     end
-    
+
     ftw = FTW::Agent.new
 
     config <<-CONFIG
@@ -341,7 +350,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       }
     }
     CONFIG
-    
+
     agent do
       # Verify the count (should now be 9)
       ftw.post!("http://127.0.0.1:9200/#{index}/_refresh")
@@ -358,7 +367,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       result = LogStash::Json.load(data)
       insist { result["hits"]["hits"] }.any? { |doc| doc["_id"] == "9" }
     end
-    
+
     after do
       teardown
     end
@@ -367,14 +376,14 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
 
   describe "Test authenticated connectivity", :elasticsearch => true, :couchdb => true do
     include Helpers
-    user = "logstash"
-    pass = "logstash"
     sequence = "/tmp/.couchdb_seq"
     index = "couchdb_test"
 
+
     before do
       buildup
       createuser
+      addmember
     end
 
     ftw = FTW::Agent.new
@@ -388,8 +397,8 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
         always_reconnect => false
         sequence_path => "#{sequence}"
         type => "couchdb"
-        username => "#{user}"
-        password => "#{pass}"
+        username => "#{Helpers::USERNAME}"
+        password => "#{Helpers::PASSWORD}"
       }
     }
     output {
@@ -402,7 +411,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       }
     }
     CONFIG
-      
+
     agent do
       # Verify the count
       ftw.post!("http://127.0.0.1:9200/#{index}/_refresh")
@@ -423,7 +432,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       # verify the 'name' field
       insist { doc3["_source"]["name"] } == "Captain America"
     end
-    
+
     after do
       deleteuser
       teardown
@@ -466,7 +475,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       }
     }
     CONFIG
-      
+
     agent do
       # Verify the count
       ftw.post!("http://127.0.0.1:9200/#{index}/_refresh")
@@ -492,7 +501,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       teardown
     end
   end
-  
+
 end
 
 

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-couchdb_changes
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-15 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,76 +28,78 @@ 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: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: json
   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: json
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: ftw
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.0.42
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.42
-  name: ftw
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.42
-- !ruby/object:Gem::Dependency
+        version: 0.0.6
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.6
-  name: logstash-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-output-elasticsearch
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-output-elasticsearch
   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
 executables: []
@@ -141,7 +141,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 input captures the _changes stream from a CouchDB instance