fluent-plugin-filter-parse-postfix 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb2a563ddd2c2f4c6474f642b8e251e25aa389ac
-  data.tar.gz: e81a0fab99ea7e33a35ebbd5407f6101228d633c
+  metadata.gz: 9b33cd07e187b679a65cac69b0ae4cd01baadd6d
+  data.tar.gz: e9786672b2557cac83ba517f9093402ea2128d9e
 SHA512:
-  metadata.gz: 8027628d1d0e0a5b8537fca65215f4adcf4b840fce226491b13a158de3b2759f784887af4f00c6ff5aed46896e96cf6df160ff9d485f02107de9b222b128d9e1
-  data.tar.gz: 96479ea5d500d813981c6acebb58efc82b901195fc77f76bf6d696ca29ea68da32f8c4dc52b0bfa646456cfb71cacc616cc485a927848d4b23472fe5f2e25164
+  metadata.gz: 6c5f72e1e9cf9acdc438336cd385557de9057c2298442a2fab1c14b4d89e75138f19da7cca0413f171c22f0f67f01d71e253b1bbc40c89723ba30b11c43e7831
+  data.tar.gz: 5a9117c1efac16ae25e91ddf47753888dc85b46a9b19ccaf07d9b94503f686142a2a085e443bf9ff5a5615513958a18320643961161026b2bb4de93c2b40f5b7

data/README.md

@@ -31,6 +31,7 @@ Or install it yourself as:
   #include_hash false
   #salt my_salt
   #sha_algorithm 512 # 1, 224, 256, 384, 512 (default)
+  #header_checks_warning false
 </filter>
 ```
 
@@ -92,3 +93,34 @@ see https://github.com/winebarrel/postfix_status_line
   "status_detail":"(250 ok ; id=en4req0070M63004172202102)"
 }
 ```
+
+### Parse Header Checks Warning
+
+```sh
+$ cat fluent.conf
+...
+<filter postfix.maillog>
+  @type grep
+  regexp1 message warning: header
+</filter>
+
+<filter postfix.maillog>
+  @type parse_postfix
+  header_checks_warning true
+</filter>
+...
+
+$ fluentd -c fluent.conf
+```
+
+```sh
+$ echo '{"message":"Mar  4 14:44:19 P788 postfix/cleanup[7426]: E80A9DF6F7E: warning: header Subject: test from local; from=<sugawara@P788.local> to=<sgwr_dts@yahoo.co.jp>"}' | fluent-cat postfix.maillog
+#=> 2017-03-04 18:26:46.146399000 +0900 postfix.maillog: {
+#     "time":"Mar  4 14:44:19","hostname":"P788",
+#     "process":"postfix/cleanup[7426]",
+#     "queue_id":"E80A9DF6F7E",
+#     "to":"********@yahoo.co.jp",
+#     "domain":"yahoo.co.jp",
+#     "from":"********@P788.local",
+#     "Subject":"test from local;"}
+```

data/fluent-plugin-filter-parse-postfix.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'fluentd', '>= 0.12'
-  spec.add_dependency 'postfix_status_line', '~> 0.2.6'
+  spec.add_dependency 'postfix_status_line', '~> 0.2.7'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/fluent/plugin/filter_parse_postfix.rb

@@ -6,46 +6,40 @@ module Fluent
   class ParsePostfixFilter < Filter
     Plugin.register_filter('parse_postfix', self)
 
-    config_param :key,           :string,  :default => 'message'
-    config_param :mask,          :bool,    :default => true
-    config_param :use_log_time,  :bool,    :default => false
-    config_param :include_hash,  :bool,    :default => false
-    config_param :salt,          :string,  :default => nil
-    config_param :sha_algorithm, :integer, :default => nil
-
-    def filter_stream(tag, es)
-      result_es = Fluent::MultiEventStream.new
-
-      es.each do |time, record|
-        parse_postfix(time, record, result_es)
-      end
-
-      result_es
-    end
-
-    private
-
-    def parse_postfix(time, record, result_es)
+    config_param :key,                   :string,  :default => 'message'
+    config_param :mask,                  :bool,    :default => true
+    config_param :use_log_time ,         :bool,    :default => false
+    config_param :include_hash,          :bool,    :default => false
+    config_param :salt,                  :string,  :default => nil
+    config_param :sha_algorithm,         :integer, :default => nil
+    config_param :header_checks_warning, :bool,    :default => false
+
+    def filter(tag, time, record)
       line = record[@key]
-      return unless line
+      return record unless line
+
+      options = {mask: @mask, hash: @include_hash, salt: @salt, parse_time: @use_log_time, sha_algorithm: @sha_algorithm}
 
-      parsed = PostfixStatusLine.parse(
-        line,
-        mask: @mask, hash: @include_hash, salt: @salt, parse_time: @use_log_time, sha_algorithm: @sha_algorithm)
+      if @header_checks_warning
+        parsed = PostfixStatusLine.parse_header_checks_warning(line, options)
+      else
+        parsed = PostfixStatusLine.parse(line, options)
+      end
 
       unless parsed
         log.warn "cannot parse a postfix log: #{line}"
-        return
+        return record
       end
 
       if @use_log_time and parsed['epoch']
         time = parsed.delete('epoch')
       end
 
-      result_es.add(time, parsed)
+      parsed
     rescue => e
       log.warn "failed to parse a postfix log: #{line}", :error_class => e.class, :error => e.message
       log.warn_backtrace
+      record
     end
   end
 end

data/lib/fluent_plugin_filter_parse_postfix/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginFilterParsePostfix
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-parse-postfix
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement