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.

Sign up for GitHub

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

Adjust ilm endpoint #1036

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Adjust ilm endpoint #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions lib/fluent/plugin/elasticsearch_compat.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
begin
require 'elasticsearch/xpack'
rescue LoadError
require 'elasticsearch/api' # For elasticsearch-ruby 8 or later
end
end

Expand Down
18 changes: 9 additions & 9 deletions lib/fluent/plugin/elasticsearch_index_lifecycle_management.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ def xpack_info
end

def get_ilm_policy
if Gem::Version.new(TRANSPORT_CLASS::VERSION) < Gem::Version.new("8.0.0")
client.ilm.get_policy
if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
client.ilm.get_lifecycle
else
client.enrich.get_policy
client.ilm.get_policy
end
end

def ilm_policy_exists?(policy_id)
begin
if Gem::Version.new(TRANSPORT_CLASS::VERSION) < Gem::Version.new("8.0.0")
client.ilm.get_policy(policy_id: policy_id)
if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
client.ilm.get_lifecycle(policy: policy_id)
else
client.enrich.get_policy(name: policy_id)
client.ilm.get_policy(policy_id: policy_id)
end
true
rescue
Expand All @@ -67,10 +67,10 @@ def ilm_policy_exists?(policy_id)

def ilm_policy_put(policy_id, policy)
log.info("Installing ILM policy: #{policy}")
if Gem::Version.new(TRANSPORT_CLASS::VERSION) < Gem::Version.new("8.0.0")
client.ilm.put_policy(policy_id: policy_id, body: policy)
if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
client.ilm.put_lifecycle(policy: policy_id, body: policy)
else
client.enrich.put_policy(name: policy_id, body: policy)
client.ilm.put_policy(policy_id: policy_id, body: policy)
end
end

Expand Down
8 changes: 4 additions & 4 deletions lib/fluent/plugin/out_elasticsearch_data_stream.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ def create_ilm_policy(datastream_name, template_name, ilm_name, host = nil)
retry_operate(@max_retry_putting_template,
@fail_on_putting_template_retry_exceed,
@catch_transport_exception_on_retry) do
if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
client(host).enrich.put_policy(params.merge(name: ilm_name))
if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
client(host).ilm.put_lifecycle(params.merge(policy: ilm_name))
else
client(host).xpack.ilm.put_policy(params.merge(policy_id: ilm_name))
end
Expand Down Expand Up @@ -159,8 +159,8 @@ def create_data_stream(datastream_name, host = nil)

def ilm_policy_exists?(policy_id, host = nil)
begin
if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
client(host).enrich.get_policy(name: policy_id)
if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
client(host).ilm.get_lifecycle(policy: policy_id)
else
client(host).ilm.get_policy(policy_id: policy_id)
end
Expand Down
10 changes: 3 additions & 7 deletions test/plugin/test_elasticsearch_index_lifecycle_management.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,15 @@ def elasticsearch_version
end

def ilm_existence_endpoint(policy_id)
if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
"_enrich/policy/#{policy_id}"
if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("8.0.0")
"_ilm/policy/#{policy_id}"
else
"_ilm/policy/%7B:policy_id=%3E%22#{policy_id}%22%7D"
end
end

def ilm_creation_endpoint(policy_id)
if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
"_enrich/policy/#{policy_id}"
else
"_ilm/policy/#{policy_id}"
end
"_ilm/policy/#{policy_id}"
end

def stub_elastic_info(url="http://localhost:9200/", version=elasticsearch_version)
Expand Down
18 changes: 3 additions & 15 deletions test/plugin/test_out_elasticsearch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,11 +524,7 @@ def stub_elastic_info_bad(url="http://localhost:9200/", version="6.4.2")
end

def ilm_endpoint
if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
'_enrich'.freeze
else
'_ilm'.freeze
end
'_ilm'.freeze
end

data("legacy_template" => [true, "_template"],
Expand Down Expand Up @@ -1179,11 +1175,7 @@ def setup
end

def ilm_endpoint
if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
'_enrich'.freeze
else
'_ilm'.freeze
end
'_ilm'.freeze
end

data("legacy_template" => [true, "_template"],
Expand Down Expand Up @@ -2601,11 +2593,7 @@ def setup


def ilm_endpoint
if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
'_enrich'.freeze
else
'_ilm'.freeze
end
'_ilm'.freeze
end

data("legacy_template" => [true, "_template"],
Expand Down
6 changes: 1 addition & 5 deletions test/plugin/test_out_elasticsearch_data_stream.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ def elasticsearch_version
end

def ilm_endpoint
if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
'_enrich'.freeze
else
'_ilm'.freeze
end
'_ilm'.freeze
end

def driver(conf='', es_version=elasticsearch_version.to_i, client_version=elasticsearch_version)
Expand Down