logstash-output-elasticsearch 0.2.3-java → 0.2.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 461df2e702f10d6e2baa9f9b653f145e95991a77
-  data.tar.gz: f04b32bfae99d5b29b7a19a1683ac56f6cd1ac7e
+  metadata.gz: 4bb85a10c092120788256aa5d94f710bcc7163db
+  data.tar.gz: 612cd465eb7606aad9dd952d051c601ef2e0e226
 SHA512:
-  metadata.gz: 12c2fc39768084afbf93a8f16da506ea708d246e01be3dbfffb2a8a73151d1340f9638bbe3949e398131be0748a774c73d58e3de8580ae45f894a520a8cdaa04
-  data.tar.gz: 8657647faf4552ce2c3490dde7c88dd6a0b0908a7301aeaf9a1d6ac9341d341cc229fe97f60420b415a0912594a74a6012a84cc01398079e51a4658d7f248179
+  metadata.gz: bc8be1e0ee550a2d5103041393c14f465ceb16920a37af0e3386efc7911e1d43d78efb86bf36d0a1642aded4900244fde6578b2f246d9b4ab57aa22d3e5adf2b
+  data.tar.gz: b8422207b16d23ce6f88176f10b21d9f4d0ec853ecd2390626fd18f3c5555f5d7cb26244d50e105b32cb18ce5637569a17212821f3103e1dd5bfc0846b066dd3

data/lib/logstash/outputs/elasticsearch.rb

@@ -393,7 +393,6 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
     end
     template_json = IO.read(@template).gsub(/\n/,'')
     template = LogStash::Json.load(template_json)
-    template['template'] = wildcard_substitute(@index)
     @logger.info("Using mapping template", :template => template)
     return template
   end # def get_template
@@ -613,15 +612,6 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
     }
   end
 
-  # helper function to replace placeholders
-  # in index names to wildcards
-  # example:
-  #    "logs-%{YYYY}" -> "logs-*"
-  private
-  def wildcard_substitute(name)
-    name.gsub(/%\{[^}]+\}/, "*")
-  end
-
   @@plugins = Gem::Specification.find_all{|spec| spec.name =~ /logstash-output-elasticsearch-/ }
 
   @@plugins.each do |plugin|

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '0.2.3'
+  s.version         = '0.2.4'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.description     = "Output events to elasticsearch"

data/spec/outputs/elasticsearch_spec.rb

@@ -583,34 +583,6 @@ describe "ship lots of events w/ default index_type and dynamic routing key usin
     end
   end
 
-  describe "wildcard substitution in index templates", :elasticsearch => true do
-    require "logstash/outputs/elasticsearch"
-
-    let(:template) { '{"template" : "not important, will be updated by :index"}' }
-
-    def settings_with_index(index)
-      return {
-        "manage_template" => true,
-        "template_overwrite" => true,
-        "protocol" => "http",
-        "host" => "localhost",
-        "index" => "#{index}"
-      }
-    end
-
-    it "should substitude placeholders" do
-      IO.stub(:read).with(anything) { template }
-      es_output = LogStash::Outputs::ElasticSearch.new(settings_with_index("index-%{YYYY}"))
-      insist { es_output.get_template['template'] } == "index-*"
-    end
-
-    it "should do nothing to an index with no placeholder" do
-      IO.stub(:read).with(anything) { template }
-      es_output = LogStash::Outputs::ElasticSearch.new(settings_with_index("index"))
-      insist { es_output.get_template['template'] } == "index"
-    end
-  end
-
   describe "index template expected behavior", :elasticsearch => true do
     ["node", "transport", "http"].each do |protocol|
       context "with protocol => #{protocol}" do

metadata

@@ -1,30 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: concurrent-ruby
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: elasticsearch
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 1.0.6
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -33,18 +42,18 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: elasticsearch
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 0.0.17
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+        version: '0.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,33 +62,25 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-  name: stud
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: cabin
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.17
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
-- !ruby/object:Gem::Dependency
+        version: '0.6'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-  name: cabin
   prerelease: false
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -87,10 +88,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -98,62 +96,64 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: ftw
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.42
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.42
-  name: ftw
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-input-generator
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.42
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-input-generator
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: manticore
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: '0.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
-  name: manticore
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Output events to elasticsearch
 email: info@elastic.co
 executables: []
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Logstash Output to Elasticsearch