logstash-output-custom-solr 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e8d36ffe58c415d72da31b08f3b2e3678d9deb61ae2b7deb5ed500674150062
-  data.tar.gz: 5f9363c482e2d8054af5ea5dcb3a1c5ff74e400c9859254ea2d8a93dcc1a78d5
+  metadata.gz: 352ec3438631b436ea2432b8146a601e9b5c5f78fe11d36708de700964511ec9
+  data.tar.gz: fdc03fdf4931310b1aea3e563c2779276bd4a8f2716cee108d80f43b93224351
 SHA512:
-  metadata.gz: f5740cfaab73d7102b06f95be3448419583366fefa8e19ec4dd22f9604fe351e8be31dcaea7eef07244a826429788fe3c1de333272adcd3e3daa19ce99479a33
-  data.tar.gz: d121012fdfa6e63995e32ede417210c9bc7874a5fe73c0f8d6c8e34006a79197608167158fc3305889e5d404a1c5cf29b787cfe48ca19851714d5a73d8ab2e08
+  metadata.gz: 6af46d59b27cfaae98dfb781885fd7136df8da44b009030dc8036c90e66cb9dfc31a1c4d06e5e9d099c946ff57a87a5f0c74cdba74ff59797407ffc81c706027
+  data.tar.gz: 042db23fbf4d788c21b57e4fbdff63a38d8847835ced2daa62791edf5eb3a13f4f4c9cfe3323cb4b4cb04353c39e1effed629d99b0fde2145445ec5e293b529d

data/lib/logstash/outputs/solr.rb

@@ -22,6 +22,9 @@ class LogStash::Outputs::Solr < LogStash::Outputs::Base
   # The SolrCloud collection name.
   config :collection, :validate => :string, :default => 'collection1'
 
+  # A field name with the name of collection to send document to
+  config :collection_field, :validate => :string, :default => nil
+
   # Commit every batch?
   config :commit, :validate => :boolean, :default => false
 
@@ -77,7 +80,7 @@ class LogStash::Outputs::Solr < LogStash::Outputs::Base
 
   public
   def flush(events, close=false)
-    documents = []
+    documents_per_col = {}
 
     events.each do |event|
       document = event.to_hash()
@@ -92,7 +95,15 @@ class LogStash::Outputs::Solr < LogStash::Outputs::Base
       
       @logger.info 'Record: %s' % document.inspect
 
+      if !@collection_field and document.has_key?(@collection_field) then
+        collection = document[@collection_field]
+      else
+        collection = @collection
+      end
+      
+      documents = documents_per_col.fetch(collection, [])
       documents.push(document)
+      documents_per_col[collection] = documents
     end
 
     params = {}
@@ -100,12 +111,15 @@ class LogStash::Outputs::Solr < LogStash::Outputs::Base
       params[:commit] = true
     end  
     params[:commitWithin] = @commitWithin
-    if @mode == MODE_STANDALONE then
-      @solr.add documents, :params => params
-      @logger.info 'Added %d document(s) to Solr' % documents.count
-    elsif @mode == MODE_SOLRCLOUD then
-      @solr.add documents, collection: @collection, :params => params
-      @logger.info 'Added %d document(s) to Solr' % documents.count
+    
+    hash.each do |collection, documents|
+      if @mode == MODE_STANDALONE then
+        @solr.add documents, :params => params
+        @logger.info 'Added %d document(s) to Solr' % documents.count
+      elsif @mode == MODE_SOLRCLOUD then
+        @solr.add documents, collection: @collection, :params => params
+        @logger.info 'Added %d document(s) to "%s" collection' % documents.count, collection
+      end
     end
 
     rescue Exception => e

data/logstash-output-custom-solr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-custom-solr'
-  s.version = "0.1.7"
+  s.version = "0.1.8"
   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."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-custom-solr
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Minoru Osuka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement