Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update elasticsearch ruby client to 8.x #16541

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem "ruby-maven-libs", "~> 3", ">= 3.9.6.1"
gem "logstash-output-elasticsearch", ">= 11.14.0"
gem "polyglot", require: false
gem "treetop", require: false
gem "faraday", "~> 1", :require => false # due elasticsearch-transport (elastic-transport) depending faraday '~> 1'
gem "faraday", "~> 2", :require => false
gem "minitar", :group => :build
gem "childprocess", "~> 4", :group => :build
gem "fpm", "~> 1", ">= 1.14.1", :group => :build # compound due to bugfix https://github.com/jordansissel/fpm/pull/1856
Expand Down
2 changes: 1 addition & 1 deletion logstash-core/lib/logstash/elasticsearch_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

require "elasticsearch"
require "elasticsearch/transport/transport/http/manticore"
require "elastic-transport"
require 'logstash/util/manticore_ssl_config_helper'
require 'logstash/util/password'

Expand Down
2 changes: 1 addition & 1 deletion logstash-core/logstash-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Gem::Specification.new do |gem|

gem.add_runtime_dependency "jrjackson", "= #{ALL_VERSIONS.fetch('jrjackson')}" #(Apache 2.0 license)

gem.add_runtime_dependency "elasticsearch", '~> 7'
gem.add_runtime_dependency "elasticsearch", '~> 8'
gem.add_runtime_dependency "manticore", '~> 0.6'

# xpack geoip database service
Expand Down
1 change: 1 addition & 0 deletions qa/integration/services/elasticsearch_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# under the License.

require 'elasticsearch'
require 'elastic-transport'
require_relative '../specs/spec_helper'

class ElasticsearchService < Service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"jruby-stdin-channel:","https://github.com/colinsurprenant/jruby-stdin-channel",Apache-2.0
"jwt:",https://github.com/jwt/ruby-jwt,MIT
"json:",http://json-jruby.rubyforge.org/,Ruby
"logger:","https://github.com/ruby/logger",BSD-2-Clause
"lru_redux:","https://github.com/SamSaffron/lru_redux/",MIT
"mail:","https://github.com/mikel/mail/",MIT
"manticore:","https://github.com/cheald/manticore/",MIT
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.