fluent-plugin-mail 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c942140f8c65ac631eb04524fa56b7b9b3a828c
-  data.tar.gz: 13d63ce8f36b574c0918db98fd26f9e182a2412e
+  metadata.gz: 3c0ed5964e665422a987c3698d6689c521cb05ae
+  data.tar.gz: c44f585a3b06b52381b74c96cc2a2a835a8ed26c
 SHA512:
-  metadata.gz: 0fe14ff31b1c4cb0bdd634ba6f399a45b761153090d057a601a595388d251661a93f43ea9bde2bb2a26fdeeb540da41289d3d9cce6957bc4389778c1a638b317
-  data.tar.gz: ea7f4254f6830d2119ff3fe12058f57d780d532f1cbcbf311d1e32eea7fe62f7e88cf4b9447470a384e303d2ce82f376f7a4ec14e8c3395b4bdd27d5f1434a74
+  metadata.gz: 1fcc02a2825ce7515ada10d5fbdcab305d05288a8a08e63632f4316a9bebb41495bd11e9762c7762199ab68d40ca4e4e674ed9e7f81c9f9448da748c03f8316b
+  data.tar.gz: ac92cac11525affb6fd81a07611582f79f025702f52ce223a1c98c8b9c124f0c2c20fdc0419e96561012ef77fe9d0823fa4a576f5946d33b0d594a4e905eb981

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.2
+
+Enhancement:
+
+* Send mail with Message-Id header field
+
 # 0.1.1
 
 Enhancement:

data/README.md

@@ -25,22 +25,26 @@ Or use td-agent : (on Ubuntu12.04)
       from SOURCE
       to DEST1,DEST2,DEST3
       subject SUBJECT: %s
-      subject_out_keys target_tag
-      out_keys target_tag,pattern,value
+      subject_out_keys tag
+      out_keys tag,foo,message
       time_locale UTC # optional
     </match>
 
+Assume following input:
+
+    tag.example: {"foo":"bar","message":"awesome!"}
+
 Email is sent like
 
     From: SOURCE
     To: DEST1,DEST2,DEST3
-    Subject: SUBJECT: #{target_tag}
+    Subject: SUBJECT: tag.example
     Mime-Version: 1.0
     Content-Type: text/plain; charset=utf-8
 
-    target_tag: #{target_tag}
-    pattern: #{pattern}
-    value: #{value}
+    tag: tag.example
+    foo: bar
+    message: awesome!
 
 ## Mail Configuration with Message Format (no auth)
 
@@ -53,22 +57,26 @@ You may use `message` parameter to define mail format as you like. Use `\n` to p
       from SOURCE
       to DEST1,DEST2,DEST3
       subject SUBJECT: %s
-      subject_out_keys target_tag
-      message %s %s\n%s
-      message_out_keys target_tag,pattern,value
+      subject_out_keys tag
+      message %s\n%s %s
+      message_out_keys tag,foo,message
       time_locale UTC # optional
     </match>
 
+Assume following input:
+
+    tag.example: {"foo":"bar","message":"awesome!"}
+
 Email is sent like
 
     From: SOURCE
     To: DEST1,DEST2,DEST3
-    Subject: SUBJECT: #{target_tag}
+    Subject: SUBJECT: tag.example
     Mime-Version: 1.0
     Content-Type: text/plain; charset=utf-8
 
-    #{target_tag} #{pattern}
-    #{value}
+    tag.example
+    bar awesome!
 
 ## Mail Configuration for Gmail(use STARTTLS)
 
@@ -84,12 +92,11 @@ Email is sent like
       password PASSWORD
       enable_starttls_auto true
       enable_tls false
-      out_keys target_tag,pattern,value
+      out_keys tag,foo,message
       time_locale UTC # optional
     </match>
 
 
-
 ## Usage Sample
 
 ### SingleNode's syslog check
@@ -140,8 +147,6 @@ use config_expander(https://github.com/tagomoris/fluent-plugin-config-expander)
 
     $ gem install fluent-plugin-config-expander
 
-
-
 source node("/etc/td-agent/td-agent.conf")
 
     <source>

data/fluent-plugin-mail.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-mail"
   gem.require_paths = ["lib"]
-  gem.version       = '0.1.1'
+  gem.version       = '0.1.2'
 
   gem.add_runtime_dependency "fluentd"
   gem.add_runtime_dependency "string-scrub" if RUBY_VERSION.to_f < 2.1

data/lib/fluent/plugin/out_mail.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 class Fluent::MailOutput < Fluent::Output
   Fluent::Plugin.register_output('mail', self)
 
@@ -190,6 +192,8 @@ class Fluent::MailOutput < Fluent::Output
       date = Time::now
     end
 
+    mid = sprintf("<%s@%s>", SecureRandom.uuid, SecureRandom.uuid)
+
     debug_msg = smtp.send_mail(<<EOS, @from, @to.split(/,/), @cc.split(/,/), @bcc.split(/,/))
 Date: #{date.strftime("%a, %d %b %Y %X %z")}
 From: #{@from}
@@ -197,6 +201,7 @@ To: #{@to}
 Cc: #{@cc}
 Bcc: #{@bcc}
 Subject: #{subject}
+Message-Id: #{mid}
 Mime-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mail
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yuichi UEMURA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd