logstash-filter-varnishlog 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e70f08b94d6fa83c9151078e5c806b796418a4b
-  data.tar.gz: 9aed70b3bff1a9ab3518ef526d03067b343d8268
+  metadata.gz: 3c08d34b9ad5c2eae13c1dd98206da8454e621b4
+  data.tar.gz: e4d80155ac77d30b1f87ec044451b971a72ce2ed
 SHA512:
-  metadata.gz: 82a1140cf06a4906c5f554f4e241c4ced35333c909c47eb66f17c2cf44867dac26fbbd640ff541f9accb8819fba48edfd9d2073242831b06befa72d3e81ce7a7
-  data.tar.gz: 818cf06c1a7d2508014ecff6cca6c4d72918dce3d6e0c9d8f8bd2a96ec04f7eb4b27e0c4b75779bb9333ea79adbd8cd2ac3d1b8c024a14316597fb1b0053f126
+  metadata.gz: 7a913c38bb62a4d456d4750e4738344732acad406e1316ee654719afb27ef7d30ca52f02d4b1f43a6fb151a037509bd20b55fe8e41d833b23b5a0802fbd2137e
+  data.tar.gz: 4c8c91d49762da74d81a5ef7942dad4624349ba47a54e17b41022d4ad6fb84d51f7a24c738657dedd01db8deb9c9d22342cdda8100361fb635d92fad38cdf5b9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.1
+  - Add xid and begin line
+  - regex performance
 ## 0.2.0
   - Make better RegEx Patterns
 ## 0.1.9

data/lib/logstash/filters/varnishlog.rb

@@ -39,9 +39,16 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
   public
   def filter(event)
     items = event.get("[message]").split("\n")
-    if request=/\*+\s+<<\s+(?<type>\w+)\s+>>\s+/.match(items[0])
+    if request=/\*+\s+<<\s+(?<type>\w+)\s+>>\s+(?<xid>\d+)/.match(items[0])
       event.set("type", request['type'].downcase)
+      event.set("xid", request['xid'])
     end
+
+    ##Begin
+    if first=/-+\s+Begin\s+(?<id>\w+\s\d+\s\w+)/.match(items[1])
+      event.set("begin", first['id'])
+    end
+
     ##Remove Blacklisted items from items hash
     items = items.grepv(blacklist_sections.join("|")) if blacklist_sections.any?
     ##
@@ -49,7 +56,7 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
     ##timestamps
     timestamps = items.grep(/Timestamp/)
     timestamps.each do |timestamp|
-      if match = /-\s+Timestamp\s+(?<step>.+): (?<time_a>.*) (?<time_b>.+) (?<time_c>.+)/.match(timestamp)
+      if match = /-{1,2}\s+Timestamp\s+(?<step>\w{3,10}): (?<time_a>\d{10}\.\d{6}) (?<time_b>(0|\d+)\.\d{6}) (?<time_c>(0|\d+)\.\d{6})/.match(timestamp)
         event.set(normalize_fields("timestamp_" + match['step'] ), match['time_a'])
         event.set(normalize_fields("timestamp_" + match['step'] + "_raw"), match['time_a'] + " " + match['time_b'] + " " + match['time_c'])
       end
@@ -76,22 +83,22 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
 
     # Requests
     ## Request headers.
-    request_headers = items.grep(/(Be)?([rR]eq|[rR]esp)Header/)
+    request_headers = items.grep(/(Bereq|Req|Beresp|Resp)Header/)
     request_headers.each do |header|
-      if match = /-+\s+(Be)?([rR]eq|[rR]esp)Header\s+(?<header_name>.+): (?<header_value>.*)/.match(header)
+      if match = /-+\s+(Bereq|Req|Beresp|Resp)Header\s+(?<header_name>.+): (?<header_value>.*)/.match(header)
         event.set(normalize_fields(match['header_name']), match['header_value'])
       end
     end
     ## Match ReqMethod.
-    if method_match = /-+\s+(Be)?([rR]eq|[rR]esp)Method\s+(?<method>.+)/.match(items.grep(/(Be)?([rR]eq|[rR]esp)Method/)[0])
+    if method_match = /-+\s+(Bereq|Req|Beresp|Resp)Method\s+(?<method>.+)/.match(items.grep(/(Bereq|Req|Beresp|Resp)Method/)[0])
       event.set("http_method", method_match['method'])
     end
     ## Match ReqURL.
-    if url_match = /-+\s+(Be)?([rR]eq|[rR]esp)URL\s+(?<url>\/.+)/.match(items.grep(/(Be)?([rR]eq|[rR]esp)URL/)[0])
+    if url_match = /-+\s+(Bereq|Req|Beresp|Resp)URL\s+(?<url>\/.+)/.match(items.grep(/(Bereq|Req|Beresp|Resp)URL/)[0])
       event.set("url", url_match['url'])
     end
     ## Match ReqProtocol.
-    if protocol_match = /-+\s+(Be)?([rR]eq|[rR]esp)Protocol\s+(?<protocol>.+)/.match(items.grep(/(Be)?([rR]eq|[rR]esp)Protocol/)[0])
+    if protocol_match = /-+\s+(Bereq|Req|Beresp|Resp)Protocol\s+(?<protocol>.+)/.match(items.grep(/(Bereq|Req|Beresp|Resp)Protocol/)[0])
       event.set("protocol", protocol_match['protocol'])
     end
     ## FetchError.
@@ -99,10 +106,10 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
       event.set("FetchError", error_match['error'])
     end
     ## Match RespStatus
-    status_match = items.grep(/(Be)?([rR]eq|[rR]esp)Status/)
+    status_match = items.grep(/(Bereq|Req|Beresp|Resp)Status/)
     states = []
     status_match.each_with_index do |status, index|
-      if match = /-+\s+(Be)?([rR]eq|[rR]esp)Status\s+(?<status>.+)/.match(status)
+      if match = /-+\s+(Bereq|Req|Beresp|Resp)Status\s+(?<status>\d{3})/.match(status)
         states.push(match['status'].to_i)
       end
       if index == status_match.size - 1
@@ -110,10 +117,10 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
       end
     end
     ## Match RespReason
-    response_reason = items.grep(/(Be)?([rR]eq|[rR]esp)Reason/)
+    response_reason = items.grep(/(Bereq|Req|Beresp|Resp)Reason/)
     reasons = []
     response_reason.each_with_index do |reason, index|
-      if match = /-+\s+(Be)?([rR]eq|[rR]esp)Reason\s+(?<reason>.+)/.match(reason)
+      if match = /-+\s+(Bereq|Req|Beresp|Resp)Reason\s+(?<reason>.+)/.match(reason)
         reasons.push(match['reason'])
       end
       if index == response_reason.size - 1

data/logstash-filter-varnishlog.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-varnishlog'
-  s.version       = '0.2.0'
+  s.version       = '0.2.1'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = 'A logstash plugin reading varnishlog output'
   s.description   = 'logstash filter plugin reading varnishlog grouped by id'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-varnishlog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Christian Herweg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement