logstash-output-elasticsearch_groom 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b9115080c650ad17374f923d63c6a6c98baaa17
-  data.tar.gz: 954271f0ec4a044425eaff23bdd670e3d2d2cc46
+  metadata.gz: b38f3fe9fb76e53deacdf9ee02b0cc26bde5b56d
+  data.tar.gz: 6882873d433b39784ba16a3765a041cba475af57
 SHA512:
-  metadata.gz: c20f425e2a951bcd60d065c5866725cab545cab3ad7dd1c8c25a69ea37ef7b539ff6a757673eb6f4df0f4b220a0959f4bf6b6977f11c56777b2479669956e8e3
-  data.tar.gz: 99e5519f3334b60b49c74e4aa1418db6d356f75709811e3964d953b4244f0bd0ff2fe2769ae234cda93563b4602b496186b141b03ae66082742c761a047902ca
+  metadata.gz: ac6b7d069ca1b04b4ad266a9c454b6f804964465402919a767fbe2033c9027faf8572d7c3a13afbdac853f2f8a5dd4982ba7fd778b44e951fd350782872fcd91
+  data.tar.gz: 53d7dd0ee85e43a6d6184776a9399322c29545c140eeb31e04c15877680b11b5ef248cc3b5de44e22ad412fd99691b4a0a7bae31828dc5f774641d3dab5d494b

data/lib/logstash/outputs/elasticsearch_groom.rb

@@ -150,9 +150,15 @@ class LogStash::Outputs::ElasticsearchGroom < LogStash::Outputs::Base
     needs_grooming = candidates.find_all do |i|
 
       if (match_data = index_parse_regex.match(i))
-        index_dt = dt_format.parseDateTime match_data[1]
-        @logger.debug? and @logger.debug "Parsed DateTime of #{i} is #{index_dt}"
-        next index_dt.isBefore abs_cutoff_dt
+        date_part = match_data[1]
+        begin
+          index_dt = dt_format.parseDateTime date_part
+          @logger.debug? and @logger.debug "Parsed DateTime of #{i} is #{index_dt}"
+          next index_dt.isBefore abs_cutoff_dt
+        rescue java.lang.IllegalArgumentException => e
+          @logger.warn "Unable to parse date from #{date_part} part of #{i}"
+          false
+        end
       end
 
     end

data/logstash-output-elasticsearch_groom.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-elasticsearch_groom'
-  s.version = '0.1.2'
+  s.version = '0.1.3'
   s.licenses = ["Apache License (2.0)"]
   s.summary = "Grooms time-series Elastichsearch indices."
   s.description = "A logstash output plugin that will perform event triggered grooming (aka pruning) of time-series indices especially those created by logstash-output-elasticsearch."

data/spec/outputs/elasticsearch_groom_spec.rb

@@ -59,4 +59,21 @@ describe 'outputs/elasticsearch_groom' do
     output.receive event
 
   end
+
+  it 'should handle non-date matches' do
+    output = outputClass.new('action' => 'delete', 'age_cutoff' => '4w', 'index' => '.marvel-%{+YYYY.MM.dd}')
+    output.register
+
+    event = LogStash::Event.new('@timestamp' => '2015-03-15T00:00:00')
+
+    expect(es_accessor).to receive(:matching_indices)
+                               .with('.marvel-*', 'open')
+                               .and_return(%w(.marvel-2015.02.12 .marvel-kibana))
+    expect(es_accessor).not_to receive(:close_indices)
+    expect(es_accessor).to receive(:delete_indices)
+                               .with(%w(.marvel-2015.02.12))
+                               .once
+    output.receive event
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch_groom
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Geoff Bourne