logstash-output-solr-lw 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6da74296645506a69741e57a51604b8a89e6c945a563abb84a6b494e873004b
-  data.tar.gz: 06f349ca9b8013f4d6fb81bc9910ec4129465e8e3f4988315365e7b369fb2add
+  metadata.gz: e4cd884e30345ea01084423d67979dea2a60fdfa65c6aa0899a61b70e8ab214a
+  data.tar.gz: 6f70bdf98145431da75d107339629d2995b4ab8b2c813b5a1227a09ee5cd83c4
 SHA512:
-  metadata.gz: 4a4530a90826245c3878b66472c2bd5ede427714b5a7231d4d155f0e45aa48757d0137d64936a317ab5a5f2f8f891ae696f874cffd0bf6badf0f12ac36b6c029
-  data.tar.gz: 86a9cb046c6df0d1a61f25c6d7d8d037a3056798c1d644a84e86590988c203ce014dc3edb1649844d75727a5f29779a34edf4f2e2297fc914d66556eccff500d
+  metadata.gz: 878b6c260ce17e3c92beefafe7df63a26545da2816c9b14b24e89ca45ae24d547960ecce38b46ad948910200fd7f36c8ded40d7e4ac0375efe7b6003c0ac3744
+  data.tar.gz: bace73f59af9ef3b8226ab6062f4ee27897ad54d0f991368a124c4f212d8baa8011bd7c87f6d376c7d2d6ace6de25bed446217aa4f20668d496ebad265af9ff5

data/lib/logstash/outputs/solr.rb

@@ -7,6 +7,7 @@ require "stud/buffer"
 require 'rsolr'
 require 'zk'
 require 'rsolr/cloud'
+require 'uri'
 
 # An Solr output that send data to Apache Solr.
 class LogStash::Outputs::Solr < LogStash::Outputs::Base
@@ -21,6 +22,10 @@ class LogStash::Outputs::Solr < LogStash::Outputs::Base
   config :zk_host, :validate => :string, :default => nil
   # The SolrCloud collection name.
   config :collection, :validate => :string, :default => 'collection1'
+  
+  # Basic Auth username and password
+  config :user, :validate => :string, :default => nil
+  config :password, :validate => :string, :default => nil
 
   # A field name with the name of collection to send document to.
   # If this property is nil then "collection" property is used.
@@ -63,10 +68,17 @@ class LogStash::Outputs::Solr < LogStash::Outputs::Base
     @zk = nil
 
     if @mode == MODE_STANDALONE then
-      @solr_std[@collection] = RSolr.connect :url => @url
+      u = @url
+      if !@user.nil? and !@user.to_s.strip.empty? and !@password.nil? and !@password.to_s.strip.empty? then
+        uri = URI.parse(@url)
+        uri.user = @user
+        uri.password = @password
+        u = uri.to_s()
+      end
+      @solr_std[@collection] = RSolr.connect :url => u
     elsif @mode == MODE_SOLRCLOUD then
       @zk = ZK.new(@zk_host)
-      cloud_connection = RSolr::Cloud::Connection.new(@zk)
+      cloud_connection = RSolr::Cloud::Connection.new(@zk, :user => @user, :password => @password)
       @solr_cloud = RSolr::Client.new(cloud_connection, read_timeout: 60, open_timeout: 60)
     end
 

data/logstash-output-solr-lw.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-solr-lw'
-  s.version = "0.4.0"
+  s.version = "0.5.0"
   s.licenses = ["Apache License (2.0)"]
   s.summary = "Logstash output plugin for sending data to Solr."
   s.description = "Logstash output plugin for sending data to Solr. It supports SolrCloud, not only Standalone Solr."
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   
   s.add_runtime_dependency 'rsolr', '~> 1.1.2'
   s.add_runtime_dependency 'zk'
-  s.add_runtime_dependency 'rsolr-cloud-lw'
+  s.add_runtime_dependency 'rsolr-cloud-lw', '~> 1.1.1'
   s.add_runtime_dependency 'stud'
 
   s.add_development_dependency "logstash-core", ">= 1.60", "<= 2.99"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-solr-lw
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Minoru Osuka
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -76,17 +76,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   name: rsolr-cloud-lw
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: