logstash-filter-varnishlog 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0acfb4d454fbb5080fd7f2cbb839e8a9784572e
-  data.tar.gz: e2ca62597cf53a52a293094a6c11a77d7b0fb13c
+  metadata.gz: 132dc667645e4c0ed4ad0923d2e3c663e0b43c1e
+  data.tar.gz: d89076af90343002b99b42d7326ffe5e4be15647
 SHA512:
-  metadata.gz: dd086fac99e01cc90fd6683a83d55c50bf3d3e8df2f71bf2becf6b12890b7c5baddf57b6494bed55a36b4817dcbeee028621aaa5ecf00d44e70ae56bacf1251f
-  data.tar.gz: dabe7c7ce47bd0495037c998da197c2a3c43e6af94cabf45f66c1400b1740ccc8396b09c872dafee9f776cd1123d59d829d8cc669ed092dd707dcd65427a5ff9
+  metadata.gz: 62741d02b6fcc571b679fd0affb71806c2e5dffea3a2f29c795ea97ec68658089763c676426a96391ec2c4e1e62e34df25c9bcd2863b55619822aa78b8f34b40
+  data.tar.gz: cff06e7c4f7b91c6a95b2e4dd8398a5d38b2d5c7f17b72313198f5ca19b3dfd9c73ed77f915ec6cb6b95d3560645f6652b9de7e991973b8bca7f2e76abdc5235

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.6
+  - Make Blacklist Case-Insentive
+  - Add normalize_fieldnames option 
+  TODO: Make Case-Match optional
+        Make normalize configurable
 ## 0.1.5
   - config to remove blacklisted items from items hash
 ## 0.1.4

data/lib/logstash/filters/varnishlog.rb

@@ -10,7 +10,7 @@ require "logstash/namespace"
 ##Extenting array class to to an something like grep -v
 class Array
   def grepv(regex, &block)
-    self.reject { |elem| elem =~ regex }.each(&block)
+    self.reject { |elem| elem.match(/#{regex}/i) }.each(&block)
   end
 end
 
@@ -26,28 +26,28 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
   # }
   #
   config_name "varnishlog"
-  
+
   # Replace the message with this value.
   #config :message, :validate => :string, :default => "Hello World!"
   config :blacklist_sections, :validate => :array, :default => []
-
+  config :normalize_fieldnames, :validate => :boolean, :default => false
   public
   def register
-    # Add instance variables 
+    # Add instance variables
   end # def register
 
   public
   def filter(event)
     items = event.get("[message]").split("\n")
     ##Remove Blacklisted items from items hash
-    items = items.grepv(/(#{blacklist_sections.join("|")})/) if blacklist_sections.any?
+    items = items.grepv(blacklist_sections.join("|")) if blacklist_sections.any?
     ##
 
     ##timestamps
     timestamps = items.grep(/Timestamp/)
     timestamps.each do |timestamp|
       if match = /-\s+Timestamp\s+(?<step>.*): (?<time_a>.*) (?<time_b>.*) (?<time_c>.*)/.match(timestamp)
-        event.set("timestamp_" + match['step'], match['time_a'])
+        event.set(normalize_fields("timestamp_" + match['step'] ), match['time_a'])
       end
     end
     ## VCL Log
@@ -58,7 +58,7 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
         log_lines.push(match['log_line'])
       end
       if index == log_lines.size - 1
-        event.set("VCL_Log", log_lines)
+        event.set(normalize_fields("VCL_Log"), log_lines)
       end
     end
 
@@ -66,58 +66,58 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
     ## Request headers.
     request_headers = items.grep(/ReqHeader/)
     request_headers.each do |header|
-      if match = /-\s+ReqHeader\s+(?<header_name>.*?): (?<header_value>.*)/.match(header)
-        event.set(match['header_name'], match['header_value'])
+      if match = /-+\s+ReqHeader\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+ReqMethod\s+(?<method>.*)/.match(items.grep(/ReqMethod/)[0])
-      event.set("http-method", method_match['method'])
+    if method_match = /-+\s+ReqMethod\s+(?<method>.*)/.match(items.grep(/ReqMethod/)[0])
+      event.set("ReqMethod", method_match['method'])
     end
     ## Match ReqURL.
-    if url_match = /-\s+ReqURL\s+(?<url>\/.*)/.match(items.grep(/ReqURL/)[0])
-      event.set("url", url_match['url'])
+    if url_match = /-+\s+ReqURL\s+(?<url>\/.*)/.match(items.grep(/ReqURL/)[0])
+      event.set("ReqUrl", url_match['url'])
     end
     ## Match ReqProtocol.
-    if protocol_match = /-\s+ReqProtocol\s+(?<protocol>.*)/.match(items.grep(/ReqProtocol/)[0])
+    if protocol_match = /-+\s+ReqProtocol\s+(?<protocol>.*)/.match(items.grep(/ReqProtocol/)[0])
       event.set("ReqProtocol", protocol_match['protocol'])
     end
-    
+
     # Response
     ## Response headers.
     response_headers = items.grep(/RespHeader/)
     response_headers.each do |header|
-      if match = /-\s+RespHeader\s+(?<header_name>.*?): (?<header_value>.*)/.match(header)
-        event.set(match['header_name'], match['header_value'])
+      if match = /-+\s+RespHeader\s+(?<header_name>.*?): (?<header_value>.*)/.match(header)
+        event.set(normalize_fields(match['header_name']), match['header_value'])
       end
     end
     ## Match RespProtocol
-    if protocol_match = /-\s+RespProtocol\s+(?<protocol>.*)/.match(items.grep(/RespProtocol/)[0])
+    if protocol_match = /-+\s+RespProtocol\s+(?<protocol>.*)/.match(items.grep(/RespProtocol/)[0])
       event.set("RespProtocol", protocol_match['protocol'])
     end
     ## Match RespStatus
     status_match = items.grep(/RespStatus/)
     states = []
     status_match.each_with_index do |status, index|
-      if match = /-\s+RespStatus\s+(?<status>.*)/.match(status)
-         states.push(match['status'].to_i)
+      if match = /-+\s+RespStatus\s+(?<status>.*)/.match(status)
+        states.push(match['status'].to_i)
       end
       if index == status_match.size - 1
-	 event.set("RespStatus", states)
+        event.set("RespStatus", states)
       end
     end
     ## Match RespReason
     response_reason = items.grep(/RespReason/)
     reasons = []
     response_reason.each_with_index do |reason, index|
-      if match = /-\s+RespReason\s+(?<reason>.*)/.match(reason)
-         reasons.push(match['reason'])
+      if match = /-+\s+RespReason\s+(?<reason>.*)/.match(reason)
+        reasons.push(match['reason'])
       end
       if index == response_reason.size - 1
         event.set("RespReason", reasons)
       end
     end
-    
+
     if @message
       # Replace the event message with our message as configured in the
       # config file.
@@ -127,4 +127,9 @@ class LogStash::Filters::Varnishlog < LogStash::Filters::Base
     # filter_matched should go in the last line of our successful code
     filter_matched(event)
   end # def filter
+
+  private
+  def normalize_fields(name)
+    name.capitalize.gsub(/[_-](\w)/){$1.upcase} if @normalize_fieldnames
+  end
 end # class LogStash::Filters::Varnishlog

data/logstash-filter-varnishlog.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-varnishlog'
-  s.version       = '0.1.5'
+  s.version       = '0.1.6'
   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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Christian Herweg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement