From 7c5c554bcb2a783df2b44858d7dc8de1f8f5293a Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Wed, 18 Nov 2015 10:51:39 +0000 Subject: [PATCH 1/2] update addon loading to underscores.bump to 2.0.2 --- CHANGELOG.md | 4 ++++ lib/logstash/outputs/elasticsearch_java.rb | 4 ++-- logstash-output-elasticsearch_java.gemspec | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83360c1..73c1767 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.2 + - Update loading of addons to conform with new naming scheme (replaced - with _) +## 2.0.1 + - Make the default template doc_value aware ## 2.0.0 - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895 diff --git a/lib/logstash/outputs/elasticsearch_java.rb b/lib/logstash/outputs/elasticsearch_java.rb index 495d607..0531e74 100644 --- a/lib/logstash/outputs/elasticsearch_java.rb +++ b/lib/logstash/outputs/elasticsearch_java.rb @@ -539,10 +539,10 @@ def retry_push(actions) } end - @@plugins = Gem::Specification.find_all{|spec| spec.name =~ /logstash-output-elasticsearch_java-/ } + @@plugins = Gem::Specification.find_all{|spec| spec.name =~ /logstash-output-elasticsearch_java_/ } @@plugins.each do |plugin| - name = plugin.name.split('-')[-1] + name = plugin.name.split('_')[-1] require "logstash/outputs/elasticsearch_java/#{name}" end diff --git a/logstash-output-elasticsearch_java.gemspec b/logstash-output-elasticsearch_java.gemspec index 75f3df0..7d72fc0 100644 --- a/logstash-output-elasticsearch_java.gemspec +++ b/logstash-output-elasticsearch_java.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'logstash-output-elasticsearch_java' - s.version = '2.0.1' + s.version = '2.0.2' s.licenses = ['apache-2.0'] s.summary = "Logstash Output to Elasticsearch using Java node/transport client" s.description = "Output events to elasticsearch using the java client" From 0a91fb2b3611b402329d1298766e8cad58e03d48 Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Wed, 18 Nov 2015 11:44:34 +0000 Subject: [PATCH 2/2] missing replace of - to _ --- lib/logstash/outputs/elasticsearch_java.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/logstash/outputs/elasticsearch_java.rb b/lib/logstash/outputs/elasticsearch_java.rb index 0531e74..7d9bec7 100644 --- a/lib/logstash/outputs/elasticsearch_java.rb +++ b/lib/logstash/outputs/elasticsearch_java.rb @@ -372,7 +372,7 @@ def client_options end @@plugins.each do |plugin| - name = plugin.name.split('-')[-1] + name = plugin.name.split('_')[-1] client_settings.merge!(LogStash::Outputs::ElasticSearchJava.const_get(name.capitalize).create_client_config(self)) end