logstash-input-elasticsearch 4.20.1 → 4.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d514926445adaa660e1e2f52cc8f453ff8e7fee24f15a66df8149ce8bb90a4d
-  data.tar.gz: b3b3f8a9c7dcfae515724cbfae3d82152c6a03484fae88cd5520f3284bc87ae9
+  metadata.gz: f2f89fa4a24aa44a90e6587f7e1e7200a64198c7a2daac985204632309ce7d35
+  data.tar.gz: a5fbe5a017b80c86ac6d87f96fd6892f6678b0ddc3b2e0b53da14805c2241848
 SHA512:
-  metadata.gz: 5facc890265d536b2846b7fc32cb12c1b266584822e0e56506788676d0b37b1f6ca0ab5b38393534a87c777a554abf0deb792734b6c7bcb3fe4d4fb2bc1c59e6
-  data.tar.gz: 1e98e8a137f844a245ded3eb1eb0af4c2177d2e29fa5df5a9b63aac6a3b88796c643f71a809b96426c47b49b95a15b431b3c3493870ac622b58f0dac246021a3
+  metadata.gz: 15aebcabed876f5f05a1a3076736fd53e4485c420210e482c76745380f689687aaa336bc6e0c3c6e31a13ca9ff12fb16c4b70e1c1f88df41a8d41c59879c22d1
+  data.tar.gz: afa2124136c904c54daeac924df2138e0791aab8b91a5a1ceb0e9b86c81bd5ffcada45d211a2decc9a8c712e6bfbeadd0cd45d975891b46c023495b0c52a009d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.20.2
+  - fix case when aggregation returns an error [#204](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/204)
+
 ## 4.20.1
   - Fix license header [#203](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/203)
 

data/lib/logstash/inputs/elasticsearch/aggregation.rb

@@ -30,6 +30,7 @@ module LogStash
           error_details = {:message => e.message, :cause => e.cause}
           error_details[:backtrace] = e.backtrace if logger.debug?
           logger.error("Tried #{job_name} unsuccessfully", error_details)
+          false
         end
 
         def do_run(output_queue)
@@ -37,7 +38,7 @@ module LogStash
           r = retryable(AGGREGATION_JOB) do
             @client.search(@agg_options)
           end
-          @plugin.push_hit(r, output_queue, 'aggregations')
+          @plugin.push_hit(r, output_queue, 'aggregations') if r
         end
       end
     end

data/logstash-input-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-elasticsearch'
-  s.version         = '4.20.1'
+  s.version         = '4.20.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads query results from an Elasticsearch cluster"
   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"

data/spec/inputs/elasticsearch_spec.rb

@@ -1071,17 +1071,16 @@ describe LogStash::Inputs::Elasticsearch, :ecs_compatibility_support do
       }
     end
 
+    let(:client) { Elasticsearch::Client.new }
     before(:each) do
-      client = Elasticsearch::Client.new
-
       expect(Elasticsearch::Client).to receive(:new).with(any_args).and_return(client)
-      expect(client).to receive(:search).with(any_args).and_return(mock_response)
       expect(client).to receive(:ping)
     end
 
     before { plugin.register }
 
     it 'creates the events from the aggregations' do
+      expect(client).to receive(:search).with(any_args).and_return(mock_response)
       plugin.run queue
       event = queue.pop
 
@@ -1089,6 +1088,16 @@ describe LogStash::Inputs::Elasticsearch, :ecs_compatibility_support do
       expect(event.get("[total_counter][value]")).to eql 10
       expect(event.get("[empty_counter][value]")).to eql 5
     end
+
+    context "when there's an exception" do
+      before(:each) do
+        allow(client).to receive(:search).and_raise RuntimeError
+      end
+      it 'produces no events' do
+        plugin.run queue
+        expect(queue).to be_empty
+      end
+    end
   end
 
   context "retries" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 4.20.1
+  version: 4.20.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement