logstash-output-elastic_app_search 1.0.0.beta1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb1acf9ad9a881367b8cd24db3559ba90655a5dc698b83d974c3ec0f417bcd02
-  data.tar.gz: 55dd2c778cfcdb2757f80515adfdeb4c1d0024d3e3972e9c241d91e739a6c2a9
+  metadata.gz: bbb2ae52ad36bc6b5ebb7234c062f49aaf31f55e9be0da33b3c653307dd385cb
+  data.tar.gz: 6bb21f904b708bb76b52ffb9cb857655e149b78db2f6057aea18dcab062fcb33
 SHA512:
-  metadata.gz: 46ec4250f8a07bee23b0eb2cd3318f1f39111cd6e9c96fb2bd16527532b19269b56edf0179b3079b5692e668f3b92d49320b4f96015852e2fae58b8cfe499e87
-  data.tar.gz: f622ab874a8ff5f981225c80c50ba85d7424e92301a9f5974c478eda7543e288acdc9b3d2e263062ce746023356efce87125756aec83ff6b38b4b39670bec0a3
+  metadata.gz: 498ee5a0621c2b42b5fb781daf75561f5c289333092c64f9a6563f8e419c9ce6143ff737b9bd3143923946c73e164b9192b338bc4f5bcdd30ff9ef2bb5666957
+  data.tar.gz: ef8154b9cf148657a72f8baaad838bb66bf56c89cc5ef369ea3b7ceffdd3a7da18768ccdbeea4a90b5f0f597af178731c59920373ba96292e7808111811e929d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.0
+  - Added support for On Premise installations of Elastic App Search
+  - Updated java client to 0.4.1
+
 ## 1.0.0.beta1
   - Changed documentation to correct required fields and other information [#2](https://github.com/logstash-plugins/logstash-output-elastic_app_search/pull/2)
   - Added check for correct host, engine and api_key during register [#2](https://github.com/logstash-plugins/logstash-output-elastic_app_search/pull/2)

data/CONTRIBUTORS

@@ -3,6 +3,7 @@ reports, or in general have helped logstash along its way.
 
 Contributors:
 * Joao Duarte - jsvduarte@gmail.com
+* Peter Kim - petedogg@gmail.com
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/lib/logstash-output-elastic_app_search_jars.rb

@@ -1 +1 @@
-require_relative '../vendor/swiftype-app-search-0.3.0-all.jar'
+require_relative '../vendor/swiftype-app-search-0.4.1-all.jar'

data/lib/logstash/outputs/elastic_app_search.rb

@@ -7,15 +7,27 @@ class LogStash::Outputs::ElasticAppSearch < LogStash::Outputs::Base
   config_name "elastic_app_search"
 
   config :engine, :validate => :string, :required => true
-  config :host, :validate => :string, :required => true
+  config :host, :validate => :string
+  config :url, :validate => :string
   config :api_key, :validate => :password, :required => true
   config :timestamp_destination, :validate => :string
   config :document_id, :validate => :string
+  config :path, :validate => :string, :default => "/api/as/v1/"
 
   public
   def register
-    @client = Client.new(@host, @api_key.value)
-    @client.get_engine(@engine)
+    if @host.nil? && @url.nil?
+      raise ::LogStash::ConfigurationError.new("Please specify either \"url\" (for self-managed) or \"host\" (for SaaS).")
+    elsif @host && @url
+      raise ::LogStash::ConfigurationError.new("Both \"url\" or \"host\" can't be set simultaneously. Please specify either \"url\" (for self-managed) or \"host\" (for SaaS).")
+    elsif @host && path_is_set?  # because path has a default value we need extra work to if the user set it
+      raise ::LogStash::ConfigurationError.new("The setting \"path\" is not compatible with \"host\". Use \"path\" only with \"url\".")
+    elsif @host
+      @client = Client.new(@host, @api_key.value)
+    elsif @url
+      @client = Client.new(nil, @api_key.value, @url + @path)
+    end
+    check_connection!
   rescue => e
     if e.message =~ /401/
       raise ::LogStash::ConfigurationError.new("Failed to connect to App Search. Error: 401. Please check your credentials")
@@ -76,4 +88,12 @@ class LogStash::Outputs::ElasticAppSearch < LogStash::Outputs::Base
       end
     end
   end
+
+  def check_connection!
+    @client.get_engine(@engine)
+  end
+
+  def path_is_set?
+    original_params.key?("path")
+  end
 end

data/logstash-output-elastic_app_search.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-elastic_app_search'
-  s.version       = '1.0.0.beta1'
+  s.version       = '1.0.0'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Index data to Elastic App Search'
   s.description   = 'This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program'
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
-  s.add_development_dependency 'jar-dependencies', '~> 0.3.2'
+  s.add_development_dependency 'jar-dependencies', '~> 0.4'
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"

data/spec/outputs/appsearch_spec.rb

@@ -9,5 +9,35 @@ describe LogStash::Outputs::ElasticAppSearch do
   let(:host) { "test-host" }
   let(:api_key) { "my_key" }
   let(:engine) { "test-engine" }
-  let(:output) { described_class.new("host" => host, "api_key" => api_key, "engine" => engine) }
+  subject { described_class.new(config) }
+
+  describe "#register" do
+    before(:each) do
+      allow(subject).to receive(:check_connection!)
+    end
+    context "when host is configured" do
+      let(:config) { { "host" => host, "api_key" => api_key, "engine" => engine } }
+      it "does not raise an error" do
+        expect { subject.register }.to_not raise_error
+      end
+    end
+    context "when host and path is configured" do
+      let(:config) { { "host" => host, "api_key" => api_key, "engine" => engine, "path" => "/v1" } }
+      it "raises an error" do
+        expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+      end
+    end
+    context "when host and url is configured" do
+      let(:config) { { "host" => host, "api_key" => api_key, "engine" => engine, "url" => "http://localhost:9300" } }
+      it "raises an error" do
+        expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+      end
+    end
+    context "when neither host nor url is configured" do
+      let(:config) { { "api_key" => api_key, "engine" => engine } }
+      it "raises an error" do
+        expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elastic_app_search
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0
 platform: ruby
 authors:
 - Joao Duarte
@@ -9,14 +9,14 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.4'
   name: jar-dependencies
   prerelease: false
   type: :development
@@ -24,7 +24,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -85,7 +85,7 @@ files:
 - lib/logstash/outputs/elastic_app_search.rb
 - logstash-output-elastic_app_search.gemspec
 - spec/outputs/appsearch_spec.rb
-- vendor/swiftype-app-search-0.3.0-all.jar
+- vendor/swiftype-app-search-0.4.1-all.jar
 homepage: https://elastic.co
 licenses:
 - Apache-2.0
@@ -103,9 +103,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.6.13