logstash-filter-varnishlog 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 522db1d86d5d2cee76999a1057b350e1bc09d0f5
-  data.tar.gz: 32ccf64fc14e3f820ecf4e3cb5b76b629a5c7a23
+  metadata.gz: 2e70f08b94d6fa83c9151078e5c806b796418a4b
+  data.tar.gz: 9aed70b3bff1a9ab3518ef526d03067b343d8268
 SHA512:
-  metadata.gz: 236c28124c363b288f951d7099ea37f70ff854f448f1628961e48560af196bf0705e1761bf6f87f29e2b36d9836fbba4154e3eb2040d20db9ec154bcbb8219b6
-  data.tar.gz: 04d156686e2e8f6cbce96e796e51ad8054a521ea0ea624d2d51b2362d85071cf5eafbccebb8aa68267e8b71bee6063e802e9089b4aafe40aa534a15a90562613
+  metadata.gz: 82a1140cf06a4906c5f554f4e241c4ced35333c909c47eb66f17c2cf44867dac26fbbd640ff541f9accb8819fba48edfd9d2073242831b06befa72d3e81ce7a7
+  data.tar.gz: 818cf06c1a7d2508014ecff6cca6c4d72918dce3d6e0c9d8f8bd2a96ec04f7eb4b27e0c4b75779bb9333ea79adbd8cd2ac3d1b8c024a14316597fb1b0053f126

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 0.2.0
+  - Make better RegEx Patterns
 ## 0.1.9
   - Add Raw Timestamps
 ## 0.1.8

data/lib/logstash/filters/varnishlog.rb

@@ -49,7 +49,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 = /-\s+Timestamp\s+(?<step>.+): (?<time_a>.*) (?<time_b>.+) (?<time_c>.+)/.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
@@ -66,7 +66,7 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
     vcl_log = items.grep(/VCL_Log/)
     log_lines = []
     vcl_log.each_with_index do |log, index|
-      if match = /-\s+VCL_Log\s+(?<log_line>.*)/.match(log)
+      if match = /-\s+VCL_Log\s+(?<log_line>.+)/.match(log)
         log_lines.push(match['log_line'])
       end
       if index == log_lines.size - 1
@@ -78,31 +78,31 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
     ## Request headers.
     request_headers = items.grep(/(Be)?([rR]eq|[rR]esp)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+(Be)?([rR]eq|[rR]esp)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+(Be)?([rR]eq|[rR]esp)Method\s+(?<method>.+)/.match(items.grep(/(Be)?([rR]eq|[rR]esp)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+(Be)?([rR]eq|[rR]esp)URL\s+(?<url>\/.+)/.match(items.grep(/(Be)?([rR]eq|[rR]esp)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+(Be)?([rR]eq|[rR]esp)Protocol\s+(?<protocol>.+)/.match(items.grep(/(Be)?([rR]eq|[rR]esp)Protocol/)[0])
       event.set("protocol", protocol_match['protocol'])
     end
     ## FetchError.
-    if error_match = /-+\s+FetchError\s+(?<error>.*)/.match(items.grep(/FetchError/)[0])
+    if error_match = /-+\s+FetchError\s+(?<error>.+)/.match(items.grep(/FetchError/)[0])
       event.set("FetchError", error_match['error'])
     end
     ## Match RespStatus
     status_match = items.grep(/(Be)?([rR]eq|[rR]esp)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+(Be)?([rR]eq|[rR]esp)Status\s+(?<status>.+)/.match(status)
         states.push(match['status'].to_i)
       end
       if index == status_match.size - 1
@@ -113,7 +113,7 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
     response_reason = items.grep(/(Be)?([rR]eq|[rR]esp)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+(Be)?([rR]eq|[rR]esp)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.1.9'
+  s.version       = '0.2.0'
   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.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Christian Herweg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement