Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a307db2
ES|QL support: ESQL executor implementation, response type to accept …
mashhurs Apr 8, 2025
9c35f22
Merge with upstream, warn if query doesn't include METADATA which DSL…
mashhurs Apr 9, 2025
6f99055
Run unit tests with the LS version which actually supports the ES|QL.
mashhurs Apr 10, 2025
086a592
Add query type to the agent. DRY of supported ES/LS versions.
mashhurs Apr 10, 2025
e30e0f9
Remove query type from user-agent since it is useless, put back accid…
mashhurs Apr 10, 2025
7746c14
Initial docs added for ES|QL.
mashhurs Apr 10, 2025
76303d8
Update query to include condition with string.
mashhurs Apr 11, 2025
1fb29f7
Tested escaped chars cases, uses orignal query.
mashhurs Apr 12, 2025
5d47f2f
Integration tests added.
mashhurs Apr 14, 2025
c291e24
Skip the ESQL test if LS with the ES client which doesn't support ESQ…
mashhurs Apr 14, 2025
22e72e9
Add comments on response type and query params about ES|QL acceptance…
mashhurs Apr 14, 2025
af6e24a
Update spec/inputs/integration/elasticsearch_esql_spec.rb
mashhurs Apr 21, 2025
4ce6fa4
Integration test skip condition correction.
mashhurs Apr 21, 2025
4ed69ff
Introduce query_params option to accept drop_null_columns, set defaul…
mashhurs Apr 24, 2025
0725f98
Fix the failed integration test.
mashhurs Apr 25, 2025
cfb36f3
Request dropping null columns and filter out null values. Consider se…
mashhurs May 1, 2025
a92a71e
Apply suggestions from code review
mashhurs May 7, 2025
d4f559d
Apply code review suggestions: to use decorator as a proc call, doc s…
mashhurs May 7, 2025
65eb675
Rename warning msg field name to avoid conflicts. Generate a target a…
mashhurs May 8, 2025
789f467
Ignore sub-fields with warninigs and keep only parent.
mashhurs May 8, 2025
fefe6a0
Introduce at high level which other params such as , etc.. follow it…
mashhurs May 26, 2025
e108c87
Add a tech preview fior the ESQL.
mashhurs May 28, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Skip the ESQL test if LS with the ES client which doesn't support ESQ…
…L feature.
  • Loading branch information
mashhurs committed Apr 14, 2025
commit c291e24e7dacfceb9285949f87598f0574b13795
6 changes: 4 additions & 2 deletions spec/inputs/integration/elasticsearch_esql_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
ES_HOSTS = ["http#{SECURE_INTEGRATION ? 's' : nil}://#{ESHelper.get_host_port}"]

let(:plugin) { described_class.new(config) }
let(:es_version) { LogStash::Inputs::Elasticsearch::ES_ESQL_SUPPORT_VERSION }
let(:es_index) { "logstash-esql-integration-#{rand(1000)}" }
let(:test_documents) do
[
Expand All @@ -32,11 +31,14 @@
end

before(:all) do
is_ls_with_esql_supported_client = Gem::Version.create(LOGSTASH_VERSION) < Gem::Version.create(LogStash::Inputs::Elasticsearch::ES_ESQL_SUPPORT_VERSION)
skip "LS version does not have ES client which supports ES|QL" unless is_ls_with_esql_supported_client

# Skip tests if ES version doesn't support ES||QL
es_client = Elasticsearch::Client.new(hosts: ES_HOSTS) # need to separately create since let isn't allowed in before(:context)
es_version_info = es_client.info["version"]
es_gem_version = Gem::Version.create(es_version_info["number"])
skip "Elasticsearch version does not support ES|QL" if es_gem_version.nil? || es_gem_version < Gem::Version.create(LogStash::Inputs::Elasticsearch::ES_ESQL_SUPPORT_VERSION)
skip "ES version does not support ES|QL" if es_gem_version.nil? || es_gem_version < Gem::Version.create(LogStash::Inputs::Elasticsearch::ES_ESQL_SUPPORT_VERSION)
end

before(:each) do
Expand Down
Loading