logstash-output-elasticsearch 10.0.2-java → 10.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b70ef694ca408c5fe028903d6c9b1b6151eb98e99ecf57566cbf938e8ba2e2
-  data.tar.gz: 0067f5844ee31e31ea545d5854aaad2e309b34c1148ad8c8e1685698eba3c96e
+  metadata.gz: 854ab6224b74941c16ddf992e2414c86b7a037de2adbd29974e89498211a42cf
+  data.tar.gz: c3a717d5cace3a2387eb319761eb8a8a6a9144d2c1bd69b35e52ae1db1cadca0
 SHA512:
-  metadata.gz: 5ab0d62f7c399abde3fc3ca4df0a879ef792b95360f5ca78f61f2e24e1a3fc4aaab4436a3700f11c3238b9dcfa3ed9d425e0b8e321b6aa50d29720d0acc19d7e
-  data.tar.gz: 4f7719371b9af4b9d1b1a4223b39835416734252804739f60174f5cbb68a61a97376b7fe53c0ab7e8ff71ba7871138fc9f28dde9cb8cd4d88e1085e35e04801d
+  metadata.gz: 6b0bd02cd4f576ade481cf60bc55b42ece3002ab53ab667f8c0a023c43ecfbb43f318ac4d2e712cb0d351fd181406aea3d6050d0401b9e22e4d092dae64f4be7
+  data.tar.gz: 1660fa95e938d2aa424d4328daf38cd42f17f58c01aa39cc5bf95c6fd1199ce3a8f4c38c40be811ff0b4f293f45dd5bef293300cddd97e7526b5f327209069a1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 10.1.0
+  - Added cluster id tracking through the plugin metadata registry [#857](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/857)
+
 ## 10.0.2
   - Fixed bug where index patterns in custom templates could be erroneously overwritten [#861](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/861)
 

data/lib/logstash/outputs/elasticsearch/common.rb

@@ -47,6 +47,7 @@ module LogStash; module Outputs; class ElasticSearch;
           sleep_interval = next_sleep_interval(sleep_interval)
         end
         if successful_connection?
+          discover_cluster_uuid
           install_template
           setup_ilm if ilm_in_use?
         end
@@ -130,6 +131,15 @@ module LogStash; module Outputs; class ElasticSearch;
       @template_installed.make_true
     end
 
+    def discover_cluster_uuid
+      return unless defined?(plugin_metadata)
+      cluster_info = client.get('/')
+      plugin_metadata.set(:cluster_uuid, cluster_info['cluster_uuid'])
+    rescue => e
+      # TODO introducing this logging message breaks many tests that need refactoring
+      # @logger.error("Unable to retrieve elasticsearch cluster uuid", error => e.message)
+    end
+
     def check_action_validity
       raise LogStash::ConfigurationError, "No action specified!" unless @action
 

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '10.0.2'
+  s.version         = '10.1.0'
   s.licenses        = ['apache-2.0']
   s.summary         = "Stores logs in Elasticsearch"
   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/unit/outputs/elasticsearch_spec.rb

@@ -486,7 +486,6 @@ describe LogStash::Outputs::ElasticSearch do
 
   context 'handling elasticsearch document-level status meant for the DLQ' do
     let(:options) { { "manage_template" => false } }
-    let(:logger)  { subject.instance_variable_get(:@logger) }
 
     context 'when @dlq_writer is nil' do
       before { subject.instance_variable_set '@dlq_writer', nil }
@@ -494,7 +493,7 @@ describe LogStash::Outputs::ElasticSearch do
       context 'resorting to previous behaviour of logging the error' do
         context 'getting an invalid_index_name_exception' do
           it 'should log at ERROR level' do
-            expect(logger).to receive(:error).with(/Could not index/, hash_including(:status, :action, :response))
+            subject.instance_variable_set(:@logger, double("logger").as_null_object)
             mock_response = { 'index' => { 'error' => { 'type' => 'invalid_index_name_exception' } } }
             subject.handle_dlq_status("Could not index event to Elasticsearch.",
               [:action, :params, :event], :some_status, mock_response)
@@ -503,7 +502,9 @@ describe LogStash::Outputs::ElasticSearch do
 
         context 'when getting any other exception' do
           it 'should log at WARN level' do
-            expect(logger).to receive(:warn).with(/Could not index/, hash_including(:status, :action, :response))
+            dlog = double_logger = double("logger").as_null_object
+            subject.instance_variable_set(:@logger, dlog)
+            expect(dlog).to receive(:warn).with(/Could not index/, hash_including(:status, :action, :response))
             mock_response = { 'index' => { 'error' => { 'type' => 'illegal_argument_exception' } } }
             subject.handle_dlq_status("Could not index event to Elasticsearch.",
               [:action, :params, :event], :some_status, mock_response)
@@ -512,7 +513,9 @@ describe LogStash::Outputs::ElasticSearch do
 
         context 'when the response does not include [error]' do
           it 'should not fail, but just log a warning' do
-            expect(logger).to receive(:warn).with(/Could not index/, hash_including(:status, :action, :response))
+            dlog = double_logger = double("logger").as_null_object
+            subject.instance_variable_set(:@logger, dlog)
+            expect(dlog).to receive(:warn).with(/Could not index/, hash_including(:status, :action, :response))
             mock_response = { 'index' => {} }
             expect do
               subject.handle_dlq_status("Could not index event to Elasticsearch.",
@@ -532,7 +535,7 @@ describe LogStash::Outputs::ElasticSearch do
       # We should still log when sending to the DLQ.
       # This shall be solved by another issue, however: logstash-output-elasticsearch#772
       it 'should send the event to the DLQ instead, and not log' do
-        expect(dlq_writer).to receive(:write).with(:event, /Could not index/)
+        expect(dlq_writer).to receive(:write).once.with(:event, /Could not index/)
         mock_response = { 'index' => { 'error' => { 'type' => 'illegal_argument_exception' } } }
         subject.handle_dlq_status("Could not index event to Elasticsearch.",
           [:action, :params, :event], :some_status, mock_response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 10.1.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement