logstash-filter-elasticsearchslowlog 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acabadb6181cf54d1a56ff1b889849eafd4e65d997eeff07e816b500e8933d6f
-  data.tar.gz: d88ad920cc826e1ef019827f65ec0b98885f321a30193b5b9265b5a2a7500d26
+  metadata.gz: 0242d4cd501af99926848b0cd889fb15d05a53a1c3e68228ad95d774f8d162e8
+  data.tar.gz: 604a0868a681a0b2902295bcb7c2e80e11334c10a27b758eead50eb0af1042f7
 SHA512:
-  metadata.gz: fd4d0abe0e5229176d2167d582607fe21250587111d9e9dffb306dfe48074c481f0e55b13de0cb0d483b0be61936aa9cea50305b221b7774fce7801c477eddf7
-  data.tar.gz: f5308a7cd27495d55d938b76f637d6d9436a0201643026ddf197572171bd7a075bf6fe74fb1a17e9077cef7be502f8a6aa7354c67953cd35dedb260610aac0be
+  metadata.gz: 69c6518cc1594f081993f7d1e45fbf5558ded250efa6649d54231df4e9ae1c6e7b1e1a3634c38023b814521c6ae2d898794030e9a34dcc724206fd06f69d26b7
+  data.tar.gz: 61b106501ecc2a93fc4ef7e44f78dcf260c72e53202ee9bc9ae12f09345e75a4bcf3cef55d08efc21b880716df8fa224e847bc681ba9e7a043c63cc015744962

data/lib/logstash/filters/elasticsearchslowlog.rb

@@ -27,7 +27,7 @@ class LogStash::Filters::Elasticsearchslowlog < LogStash::Filters::Base
   SLOWLOG_REGEX = /^\s*\[(?<local_timestamp>[^,]+),\d+\]\s*\[(?<level>.+?)\s*\]\s*\[index.search.slowlog.(?:query|fetch)\]\s*\[(?<node>.+?)\]\s*\[(?<index>.+?)\]\s*\[(?<shard>.+?)\]\s*(?<key_values>.+)$/.freeze
 
   def filter(event)
-    message = event[@source]
+    message = event_get(event, @source)
     if message
       if matches = message.match(SLOWLOG_REGEX)
         captures = Hash[matches.names.zip(matches.captures)]
@@ -37,7 +37,7 @@ class LogStash::Filters::Elasticsearchslowlog < LogStash::Filters::Base
           if ['shard'].include?(key)
             value = value.to_i
           end
-          event[key] = value
+          event_set(event, key, value)
         end
         if captures['key_values']
           key_values = parse_key_values(captures['key_values'])
@@ -45,7 +45,7 @@ class LogStash::Filters::Elasticsearchslowlog < LogStash::Filters::Base
             if ['took_millis', 'total_shards'].include?(key)
               value = value.to_i
             end
-            event[key] = value
+            event_set(event, key, value)
           end
 
           source = key_values['source']
@@ -54,8 +54,8 @@ class LogStash::Filters::Elasticsearchslowlog < LogStash::Filters::Base
             if normalized
               normalized = JSON.dump(normalized)
               source_id = Digest::MD5.hexdigest(normalized)[0..8]
-              event['source_normalized'] = normalized
-              event['source_id'] = source_id.force_encoding("utf-8")
+              event_set(event, 'source_normalized', normalized)
+              event_set(event, 'source_id', source_id.force_encoding("utf-8"))
             end
           end
         end
@@ -65,6 +65,22 @@ class LogStash::Filters::Elasticsearchslowlog < LogStash::Filters::Base
     filter_matched(event)
   end
 
+  def event_get(event, field)
+    if event.respond_to?(:get)
+      event.get(field)
+    else
+      event[field]
+    end
+  end
+
+  def event_set(event, field, value)
+    if event.respond_to?(:set)
+      event.set(field, value)
+    else
+      event[field] = value
+    end
+  end
+
   private
 
   def parse_key_values(kv)

data/logstash-filter-elasticsearchslowlog.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-elasticsearchslowlog'
-  s.version       = '0.4.0'
+  s.version       = '0.5.0'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'elasticsearch slowlog parser'
   s.description   = 'elasticsearch slowlog parser'
@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "deepsort", "0.4.0"
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.20", "<= 2.99"
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'appraisal'
 end

data/spec/filters/elasticsearchslowlog_spec.rb

@@ -14,20 +14,20 @@ describe LogStash::Filters::Elasticsearchslowlog do
 
   describe "filter" do
     sample("message" => "some text") do
-      expect(subject['message']).to eq('some text')
+      expect(event_get(subject, 'message')).to eq('some text')
     end
 
     sample("message" => '[2019-05-07T15:27:34,422][TRACE ][index.search.slowlog.query] [elasticsearch-data7.mid.veritrans.co.id] [transactionsv3_2018-12][2] took[350.9ms], took_millis[350], types[transaction], stats[], search_type[QUERY_THEN_FETCH], total_shards[111], source[{"from":0,"size":20,"query":{"bool":{"filter":[{"terms":{"transaction.merchant_id":["abcd"],"boost":1.0}}],"disable_coord":false,"adjust_pure_negative":true,"boost":1.0}},"sort":[{"transaction.transaction_time":{"order":"desc"}}]}],') do
-      expect(subject['local_timestamp']).to eq('2019-05-07T15:27:34')
-      expect(subject['level']).to eq('TRACE')
-      expect(subject['node']).to eq('elasticsearch-data7.mid.veritrans.co.id')
-      expect(subject['index']).to eq('transactionsv3_2018-12')
-      expect(subject['shard']).to eq(2)
-      expect(subject['took_millis']).to eq(350)
-      expect(subject['types']).to eq('transaction')
-      expect(subject['search_type']).to eq('QUERY_THEN_FETCH')
-      expect(subject['total_shards']).to eq(111)
-      expect(subject['source']).to eq('{"from":0,"size":20,"query":{"bool":{"filter":[{"terms":{"transaction.merchant_id":["abcd"],"boost":1.0}}],"disable_coord":false,"adjust_pure_negative":true,"boost":1.0}},"sort":[{"transaction.transaction_time":{"order":"desc"}}]}')
+      expect(event_get(subject, 'local_timestamp')).to eq('2019-05-07T15:27:34')
+      expect(event_get(subject, 'level')).to eq('TRACE')
+      expect(event_get(subject, 'node')).to eq('elasticsearch-data7.mid.veritrans.co.id')
+      expect(event_get(subject, 'index')).to eq('transactionsv3_2018-12')
+      expect(event_get(subject, 'shard')).to eq(2)
+      expect(event_get(subject, 'took_millis')).to eq(350)
+      expect(event_get(subject, 'types')).to eq('transaction')
+      expect(event_get(subject, 'search_type')).to eq('QUERY_THEN_FETCH')
+      expect(event_get(subject, 'total_shards')).to eq(111)
+      expect(event_get(subject, 'source')).to eq('{"from":0,"size":20,"query":{"bool":{"filter":[{"terms":{"transaction.merchant_id":["abcd"],"boost":1.0}}],"disable_coord":false,"adjust_pure_negative":true,"boost":1.0}},"sort":[{"transaction.transaction_time":{"order":"desc"}}]}')
       expect(subject).to include('source_id')
     end
   end
@@ -49,10 +49,10 @@ describe LogStash::Filters::Elasticsearchslowlog do
         expect(subject).to include('total_shards')
         expect(subject).to include('source')
         expect(subject).to include('source_id')
-        unless subject['source_normalized'] == source_normalized[i]
-          puts subject['source_normalized']
+        unless event_get(subject, 'source_normalized') == source_normalized[i]
+          puts event_get(subject, 'source_normalized')
         end
-        expect(subject['source_normalized']).to eq(source_normalized[i])
+        expect(event_get(subject, 'source_normalized')).to eq(source_normalized[i])
       end
     end
   end
@@ -65,4 +65,12 @@ describe LogStash::Filters::Elasticsearchslowlog do
       end
     end
   end
+
+  def event_get(event, field)
+    if event.respond_to?(:get)
+      event.get(field)
+    else
+      event[field]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-elasticsearchslowlog
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Anantha Kumaran
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: appraisal
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: elasticsearch slowlog parser
 email: ananthakumaran@gmail.com
 executables: []