fluent-plugin-mule 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8ee78dafd7dd6aa40cebba7db6fa251ddb0469d
-  data.tar.gz: 3793bbea0b21e20c4b45ed5fcf5cc605cd29f2ee
+  metadata.gz: 887fb6cd62de2ad184f1c5b783a4b8b329234a49
+  data.tar.gz: 601b0839d9ab6355986af97bee0ca2093f2ddd68
 SHA512:
-  metadata.gz: 3b23f82d97aba5426f345e16d3674d288e74fd4c4c887c45f5da3714ffb39ebf8ce4413450a52ff4199aa11dc72d554b2904c96142771d7992d23c28c7379d23
-  data.tar.gz: eabb9dc283fdbb8b5c15062a0ae5fd8d15957df9c1ff9243010da435b4af89653636c02106afbaa67e875f2359bec53084edbb938e122195d758ddb014b4af1a
+  metadata.gz: 672a1ef989dc0fca20fd54db9fc510ed25ed777ad9ddc19db0b8967ff1df2d2d4bd7b550789d07ece336a462a976b5ae9c5ace98c82c0e42b8b9e433e58e1e74
+  data.tar.gz: 107e36c6b65f0cdc8b5e0dafb8d119bb5c6576cc595884e7d2d452358f7ad34889b2dbd0acee87de0e064f9cfc8cfd110b581ea81119f880708b33824cc04520

data/lib/fluent/plugin/filter_mule.rb

@@ -6,11 +6,13 @@ module Fluent
     Fluent::Plugin.register_filter('mule', self)
 
     # config_param works like other plugins
+    config_param :key_name, :string, :default => 'message'
     config_param :kv_delimiter, :string, :default => ' '
     config_param :kv_char, :string, :default => '='      
     config_param :time_parse, :bool, :default => false
     # 2016-12-09 14:50:51,330
     config_param :time_format, :string, :default => '%Y-%m-%d %H:%M:%S,%L'
+    config_param :prefix, :string, :default => 'mule_'
 
     def configure(conf)
       super
@@ -36,71 +38,56 @@ module Fluent
       # It is internal to this class and called by filter_stream unless
       # the user overrides filter_stream.
       #
-      # Since our example is a pass-thru filter, it does nothing and just
-      # returns the record as-is.
       # If returns nil, that records are ignored.
-      text = record['message']
-      puts "TEXT: " + text
+      text = record[@key_name]
 
-      match = text.match(/^(?<log_level>[\w]+)\s(?<log_time>\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2},\d{3})\s\[(?<thread>.+)\]\s(?<position>[^:]+):\s(?<kv_pairs>.*?)\s?(?<payload>payload=.*)?$/)
+      messageRegex = /
+        ^
+        (?<log_level>[\w]+)\s
+        (?<log_time>\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2},\d{3})\s
+        \[(?<thread>.+)\]\s
+        (?<position>[^:]+):\s
+        (?<kv_pairs>.*?)\s?
+        (?<payload>payload=.*)?
+        $
+      /x
+      
+      match = text.match(messageRegex)      
 
+      # If message doesn't match regex we return the record as is
       if match.nil?
-        puts 'match is nil'
         return record
       end
 
-      puts '1'
-      if match.names.include? 'log_level'
-        record['mule_log_level'] = match['log_level']
-      end
-      puts '2'
-      if match.names.include? 'log_time'
-        record['mule_log_time'] = match['log_time']
-      end
-      puts '3'
-      if match.names.include? 'thread'
-        record['mule_thread'] = match['thread']
-      end
-      puts '4'
-      if match.names.include? 'position'
-        record['mule_position'] = match['position']
-      end       
-      puts '5'
-      if match.names.include? 'kv_pairs'
-        kv_match = match['kv_pairs'].match(/(\w+)=([\w|-]+)\s/)
-        if kv_match == nil
-          puts 'Couldn\'t find kv pairs'
-          return record 
-        end
-
-        match['kv_pairs'].split(@kv_delimiter).each { |kv|
-          k, v = kv.split(@kv_char, 2)
-          record['mule_' + k] = v
-        }
-      end
-      puts '6'
-
-      if (match.names.include? 'payload') && !match['payload'].nil?
-        puts '6.1'
-        k, v = match['payload'].split('=', 2)
-        puts '6.2'
-        record['mule_' + k] = v
-      end
+      ['log_level', 'log_time', 'thread', 'position', 'kv_pairs', 'payload'].each { |group|
+        updateRecord(record, match, group, group == 'kv_pairs')
+      }
         
-      puts '7'
-      puts 'record[log_time]: ' + record['mule_log_time']
-      puts 'record[log_time].nil?: ' + record['mule_log_time'].nil?.to_s
-      puts 'timeParse?: ' + @time_parse.to_s
       if @time_parse && !record['log_time'].nil? 
-        puts '7.1'
         new_time = @time_parser.parse(record['mule_log_time'])
         record.delete('time')
         record['time'] = current_time
       end
-      puts '8'
-      record.delete('message')
-      puts '9'
+      record.delete(@key_name)
       record
     end
+
+    def updateRecord(record, match, group, kv_flag)
+      if (match.names.include? group) && !match[group].nil?
+        if kv_flag
+          kv_match = match[group].match(/(\w+)=([\w|-]+)\s/)
+          if kv_match.nil?
+            return 
+          end
+
+          match[group].split(@kv_delimiter).each { |kv|
+            k, v = kv.split(@kv_char, 2)
+            record[@prefix + k] = v
+          }
+        else
+          record[@prefix + group] = match[group]
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mule
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Rodrigo Martinez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies: []
 description: Extract entries from Mule log4j key-value pairs
 email:
@@ -41,6 +41,6 @@ rubyforge_project:
 rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
-summary: Fluentd filter plugin. Extract fields from Mule/Log4j formatted entries containing
-  key value pairs
+summary: Fluentd filter plugin. Extracts fields from Mule/Log4j formatted entries
+  containing key value pairs
 test_files: []