Skip to content

Business intelligence made simple

Removed elasticsearch-xpack dependency for Elasticsearch

Andrew Kane544694602bf1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cea44c94..8d6f564e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 2.4.8 (unreleased)
- Added support for OpenSearch
+- Removed `elasticsearch-xpack` dependency for Elasticsearch
## 2.4.7 (2021-09-25)
diff --git a/lib/blazer/adapters/elasticsearch_adapter.rb b/lib/blazer/adapters/elasticsearch_adapter.rb
index d701a3e8..7e469d47 100644
--- a/lib/blazer/adapters/elasticsearch_adapter.rb
+++ b/lib/blazer/adapters/elasticsearch_adapter.rb
@@ -7,10 +7,10 @@ module Blazer
error = nil
begin
- response = client.xpack.sql.query(body: {query: "#{statement} /*#{comment}*/"})
+ response = client.transport.perform_request("POST", endpoint, {}, {query: "#{statement} /*#{comment}*/"}).body
columns = response["columns"].map { |v| v["name"] }
# Elasticsearch does not differentiate between dates and times
- date_indexes = response["columns"].each_index.select { |i| response["columns"][i]["type"] == "date" }
+ date_indexes = response["columns"].each_index.select { |i| ["date", "datetime"].include?(response["columns"][i]["type"]) }
if columns.any?
rows = response["rows"]
date_indexes.each do |i|
@@ -38,6 +38,10 @@ module Blazer
protected
+ def endpoint
+ @endpoint ||= client.info["version"]["number"].to_i >= 7 ? "_sql" : "_xpack/sql"
+ end
+
def client
@client ||= Elasticsearch::Client.new(url: settings["url"])
end