logstash-output-elasticsearch_groom 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 572182b0e882b6216332343092806f1444dca57e
-  data.tar.gz: 6a8d23c1889ca80591e56205a28a431b565ecf72
+  metadata.gz: 2b9115080c650ad17374f923d63c6a6c98baaa17
+  data.tar.gz: 954271f0ec4a044425eaff23bdd670e3d2d2cc46
 SHA512:
-  metadata.gz: 10adaacb5004ff852d175b2c1a71deea3c17b6cfe81b2e4a5a54b2cfcba26cec52b718d68059da44322b29606bba0824af903cf1b6f2d9ba0fad24520d07caaa
-  data.tar.gz: 05208d886fedeb73454205b7d8cd7ab67073d96204c5ae7398048588b98ce9f1b6a441ca1692c7569a6ffbbd27503c4f4d07a463784672010a0514266fc57d0e
+  metadata.gz: c20f425e2a951bcd60d065c5866725cab545cab3ad7dd1c8c25a69ea37ef7b539ff6a757673eb6f4df0f4b220a0959f4bf6b6977f11c56777b2479669956e8e3
+  data.tar.gz: 99e5519f3334b60b49c74e4aa1418db6d356f75709811e3964d953b4244f0bd0ff2fe2769ae234cda93563b4602b496186b141b03ae66082742c761a047902ca

data/README.md

@@ -1,4 +1,8 @@
-# Logstash Plugin
+# Elasticsearch Groom Logstash Output Plugin
+
+[![Gem Version](https://badge.fury.io/rb/logstash-output-elasticsearch_groom.svg)](http://badge.fury.io/rb/logstash-output-elasticsearch_groom)
+
+[![Circle CI](https://circleci.com/gh/itzg/logstash-output-elasticsearch-groom.svg?style=svg)](https://circleci.com/gh/itzg/logstash-output-elasticsearch-groom)
 
 This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
 
@@ -83,4 +87,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/outputs/elasticsearch_groom.rb

@@ -105,7 +105,7 @@ class LogStash::Outputs::ElasticsearchGroom < LogStash::Outputs::Base
   def receive(event)
     return unless output?(event)
 
-    ts_wildcarded = @index.gsub /%{\+.+}/, '*'
+    ts_wildcarded = @index.gsub /%{\+[^}]+}/, '*'
     ts_wildcarded = event.sprintf ts_wildcarded
 
     resolved_scope = event.sprintf(@scope)
@@ -115,7 +115,7 @@ class LogStash::Outputs::ElasticsearchGroom < LogStash::Outputs::Base
     @logger.debug? and @logger.debug "Starting with #{candidates}"
 
     groomed = []
-    if (ts_bit_matched = @index.match /%{\+(.+)}/)
+    if (ts_bit_matched = @index.match /%{\+([^}]+)}/)
       groomed = groom_by_time(event, candidates, ts_bit_matched)
     else
       @logger.warn "Only 'index' with a timestamp placeholder is supported. Instead had #{resolvedIndex}"

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.1'
+  s.version = '0.1.2'
   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

@@ -42,4 +42,21 @@ describe 'outputs/elasticsearch_groom' do
     output.receive event
 
   end
+
+  it 'should handle an index with field references also' do
+    output = outputClass.new('action' => 'delete', 'age_cutoff' => '4w', 'index' => 'logstash-%{+YYYY.MM.dd}-%{subtype}')
+    output.register
+
+    event = LogStash::Event.new('@timestamp' => '2015-03-15T00:00:00', 'subtype' => 'logs')
+
+    expect(es_accessor).to receive(:matching_indices)
+                               .with('logstash-*-logs', 'open')
+                               .and_return(%w(logstash-2015.03.12-logs logstash-2015.02.13-logs logstash-2015.02.12-logs))
+    expect(es_accessor).not_to receive(:close_indices)
+    expect(es_accessor).to receive(:delete_indices)
+                               .with(%w(logstash-2015.02.13-logs logstash-2015.02.12-logs))
+                               .once
+    output.receive event
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch_groom
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Geoff Bourne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jar-dependencies