logstash-output-email 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- MGExYjgwYzBlYTE4OGRjY2I1YjQ0MzdkZjNjZjliNWEwNDM4OTcxZg==
5
- data.tar.gz: !binary |-
6
- OTQ5MWUwNjhjNzNjMDQ5OTk5YzAyOWE4MzRkMzIwNWJiYTJmYzEwNQ==
2
+ SHA1:
3
+ metadata.gz: 57f7aa4ebd232c89a45338d658fb97a05463f740
4
+ data.tar.gz: ae8f383feb1291e5da8d559ee614d8dab44e3ba0
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- NzRiYmFjMjM5MjliYzVmZDQwNzQ3Mjk0NDBlMjg3ZGJkZGY4YjkwZDQ2Zjkw
10
- MDc1OGQ2Mzc4N2U4NTM0ODVlMGQ5MTQzMjE2ZDc1NTM4NWIwYThjMjU4OWUw
11
- NGM1YmNmYTVmM2U1ZjVlYTIwYzk1ZmI4ZjY3YTJjODQyMjg3YTA=
12
- data.tar.gz: !binary |-
13
- MGE4Y2U3ZjM2M2QyNzIxNDcxYWUwNmFlNThlMjZlNGEzZDA2M2Q4ZTMyMzQw
14
- MTljZmMzYzJmZDA5Y2M4ZjRiY2U4MzIzYWM5YjNlNThkZDM4NGFlNWY3Nzk2
15
- MTc2ZTRlYThhYjU2MjhjNjllZTcxMmI1MDQ3ODAzZjkxNGVkZDg=
6
+ metadata.gz: 1d581dfaffa7361379b94be39bb0bea172740ad2a5fcaeaba29e47b7b767f875a8695e12294fb53c0eaeeb489c99abe32aa08157398c70331d8118d6d89ae6d7
7
+ data.tar.gz: 09a818a48d115e37ec4f73f497f67ee93f10470cdd499090ba13257bdb212bf1d3129dcd4d8e60ff59fc1f08d7b53e43699797c2c7be40fa455be91ec82cc087
data/Gemfile CHANGED
@@ -1,4 +1,3 @@
1
- source 'http://rubygems.org'
2
- gem 'rake'
3
- gem 'gem_publisher'
4
- gem 'archive-tar-minitar'
1
+ source 'https://rubygems.org'
2
+ gemspec
3
+ gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"
data/LICENSE ADDED
@@ -0,0 +1,13 @@
1
+ Copyright (c) 2012-2014 Elasticsearch <http://www.elasticsearch.org>
2
+
3
+ Licensed under the Apache License, Version 2.0 (the "License");
4
+ you may not use this file except in compliance with the License.
5
+ You may obtain a copy of the License at
6
+
7
+ http://www.apache.org/licenses/LICENSE-2.0
8
+
9
+ Unless required by applicable law or agreed to in writing, software
10
+ distributed under the License is distributed on an "AS IS" BASIS,
11
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ See the License for the specific language governing permissions and
13
+ limitations under the License.
data/Rakefile CHANGED
@@ -4,3 +4,4 @@ task :default do
4
4
  system("rake -T")
5
5
  end
6
6
 
7
+ require "logstash/devutils/rake"
@@ -12,7 +12,7 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
12
12
  # This setting is deprecated in favor of Logstash's "conditionals" feature
13
13
  # If you were using this setting previously, please use conditionals instead.
14
14
  #
15
- # If you need help converting your older 'match' setting to a conditional,
15
+ # If you need help converting your older `match` setting to a conditional,
16
16
  # I welcome you to join the #logstash irc channel on freenode or to email
17
17
  # the logstash-users@googlegroups.com mailling list and ask for help! :)
18
18
  config :match, :validate => :hash, :deprecated => true
@@ -20,9 +20,9 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
20
20
  # The fully-qualified email address to send the email to.
21
21
  #
22
22
  # This field also accepts a comma-separated string of addresses, for example:
23
- # "me@host.com, you@host.com"
23
+ # `"me@host.com, you@host.com"`
24
24
  #
25
- # You can also use dynamic fields from the event with the %{fieldname} syntax.
25
+ # You can also use dynamic fields from the event with the `%{fieldname}` syntax.
26
26
  config :to, :validate => :string, :required => true
27
27
 
28
28
  # The fully-qualified email address for the From: field in the email.
@@ -34,7 +34,7 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
34
34
  # The fully-qualified email address(es) to include as cc: address(es).
35
35
  #
36
36
  # This field also accepts a comma-separated string of addresses, for example:
37
- # "me@host.com, you@host.com"
37
+ # `"me@host.com, you@host.com"`
38
38
  config :cc, :validate => :string
39
39
 
40
40
  # How Logstash should send the email, either via SMTP or by invoking sendmail.
@@ -42,13 +42,13 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
42
42
 
43
43
  # Specify the options to use:
44
44
  #
45
- # Via SMTP: smtpIporHost, port, domain, userName, password, authenticationType, starttls
45
+ # Via SMTP: `smtpIporHost`, `port`, `domain`, `userName`, `password`, `authenticationType`, `starttls`
46
46
  #
47
- # Via sendmail: location, arguments
47
+ # Via sendmail: `location`, `arguments`
48
48
  #
49
49
  # If you do not specify any `options`, you will get the following equivalent code set in
50
50
  # every new mail object:
51
- #
51
+ # [source,ruby]
52
52
  # Mail.defaults do
53
53
  # delivery_method :smtp, { :smtpIporHost => "localhost",
54
54
  # :port => 25,
@@ -70,15 +70,15 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
70
70
  #
71
71
  # Each mail object inherits the defaults set in Mail.delivery_method. However, on
72
72
  # a per email basis, you can override the method:
73
- #
73
+ # [source,ruby]
74
74
  # mail.delivery_method :sendmail
75
75
  #
76
76
  # Or you can override the method and pass in settings:
77
- #
77
+ # [source,ruby]
78
78
  # mail.delivery_method :sendmail, { :address => 'some.host' }
79
79
  #
80
80
  # You can also just modify the settings:
81
- #
81
+ # [source,ruby]
82
82
  # mail.delivery_settings = { :address => 'some.host' }
83
83
  #
84
84
  # The hash you supply is just merged against the defaults with "merge!" and the result
@@ -1,13 +1,13 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-output-email'
4
- s.version = '0.1.0'
4
+ s.version = '0.1.1'
5
5
  s.licenses = ['Apache License (2.0)']
6
6
  s.summary = "Send email when an output is received."
7
- s.description = "Send email when an output is received."
7
+ s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
8
8
  s.authors = ["Elasticsearch"]
9
- s.email = 'richard.pijnenburg@elasticsearch.com'
10
- s.homepage = "http://logstash.net/"
9
+ s.email = 'info@elasticsearch.com'
10
+ s.homepage = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
11
11
  s.require_paths = ["lib"]
12
12
 
13
13
  # Files
@@ -17,12 +17,13 @@ Gem::Specification.new do |s|
17
17
  s.test_files = s.files.grep(%r{^(test|spec|features)/})
18
18
 
19
19
  # Special flag to let us know this is actually a logstash plugin
20
- s.metadata = { "logstash_plugin" => "true", "group" => "output" }
20
+ s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
21
21
 
22
22
  # Gem dependencies
23
23
  s.add_runtime_dependency 'logstash', '>= 1.4.0', '< 2.0.0'
24
24
 
25
25
  s.add_runtime_dependency 'mail'
26
26
 
27
+ s.add_development_dependency 'logstash-devutils'
27
28
  end
28
29
 
@@ -1,12 +1,12 @@
1
- require "spec_helper"
1
+ require "logstash/devutils/rspec/spec_helper"
2
2
  require "rumbster"
3
3
  require "message_observers"
4
4
 
5
5
  describe "outputs/email", :broken => true do
6
6
 
7
7
 
8
- @@port=2525
9
- let (:rumbster) { Rumbster.new(@@port) }
8
+ port = 2525
9
+ let (:rumbster) { Rumbster.new(port) }
10
10
  let (:message_observer) { MailMessageObserver.new }
11
11
 
12
12
  before :each do
@@ -36,7 +36,7 @@ describe "outputs/email", :broken => true do
36
36
  email {
37
37
  to => "email1@host, email2@host"
38
38
  match => ["mymatch", "dummy_match,ok"]
39
- options => ["port", #{@@port}]
39
+ options => ["port", #{port}]
40
40
  }
41
41
  }
42
42
  CONFIG
@@ -67,7 +67,7 @@ describe "outputs/email", :broken => true do
67
67
  email {
68
68
  to => "%{to_addr}"
69
69
  match => ["mymatch", "dummy_match,ok"]
70
- options => ["port", #{@@port}]
70
+ options => ["port", #{port}]
71
71
  }
72
72
  }
73
73
  CONFIG
@@ -98,7 +98,7 @@ describe "outputs/email", :broken => true do
98
98
  subject => "Hello World"
99
99
  body => "Line1\\nLine2\\nLine3"
100
100
  match => ["mymatch", "dummy_match,*"]
101
- options => ["port", #{@@port}]
101
+ options => ["port", #{port}]
102
102
  }
103
103
  }
104
104
  CONFIG
@@ -130,7 +130,7 @@ describe "outputs/email", :broken => true do
130
130
  subject => "Hello World"
131
131
  body => "Line1\\nLine2\\nLine3"
132
132
  match => ["mymatch", "dummy_match,*"]
133
- options => ["port", #{@@port}, "authenticationType", "nil"]
133
+ options => ["port", #{port}, "authenticationType", "nil"]
134
134
  }
135
135
  }
136
136
  CONFIG
@@ -157,7 +157,7 @@ describe "outputs/email", :broken => true do
157
157
  subject => "Hello World"
158
158
  body => "Mail body"
159
159
  match => ["messageAndSourceMatch", "message,*hello,,and,source,*generator"]
160
- options => ["port", #{@@port}, "authenticationType", "nil"]
160
+ options => ["port", #{port}, "authenticationType", "nil"]
161
161
  }
162
162
  }
163
163
  CONFIG
metadata CHANGED
@@ -1,87 +1,100 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-email
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elasticsearch
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-03 00:00:00.000000000 Z
11
+ date: 2014-11-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: logstash
15
14
  requirement: !ruby/object:Gem::Requirement
16
15
  requirements:
17
- - - ! '>='
16
+ - - '>='
18
17
  - !ruby/object:Gem::Version
19
18
  version: 1.4.0
20
19
  - - <
21
20
  - !ruby/object:Gem::Version
22
21
  version: 2.0.0
23
- type: :runtime
22
+ name: logstash
24
23
  prerelease: false
24
+ type: :runtime
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
- - - ! '>='
27
+ - - '>='
28
28
  - !ruby/object:Gem::Version
29
29
  version: 1.4.0
30
30
  - - <
31
31
  - !ruby/object:Gem::Version
32
32
  version: 2.0.0
33
33
  - !ruby/object:Gem::Dependency
34
- name: mail
35
34
  requirement: !ruby/object:Gem::Requirement
36
35
  requirements:
37
- - - ! '>='
36
+ - - '>='
38
37
  - !ruby/object:Gem::Version
39
38
  version: '0'
39
+ name: mail
40
+ prerelease: false
40
41
  type: :runtime
42
+ version_requirements: !ruby/object:Gem::Requirement
43
+ requirements:
44
+ - - '>='
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
47
+ - !ruby/object:Gem::Dependency
48
+ requirement: !ruby/object:Gem::Requirement
49
+ requirements:
50
+ - - '>='
51
+ - !ruby/object:Gem::Version
52
+ version: '0'
53
+ name: logstash-devutils
41
54
  prerelease: false
55
+ type: :development
42
56
  version_requirements: !ruby/object:Gem::Requirement
43
57
  requirements:
44
- - - ! '>='
58
+ - - '>='
45
59
  - !ruby/object:Gem::Version
46
60
  version: '0'
47
- description: Send email when an output is received.
48
- email: richard.pijnenburg@elasticsearch.com
61
+ description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
62
+ email: info@elasticsearch.com
49
63
  executables: []
50
64
  extensions: []
51
65
  extra_rdoc_files: []
52
66
  files:
53
67
  - .gitignore
54
68
  - Gemfile
69
+ - LICENSE
55
70
  - Rakefile
56
71
  - lib/logstash/outputs/email.rb
57
72
  - logstash-output-email.gemspec
58
- - rakelib/publish.rake
59
- - rakelib/vendor.rake
60
73
  - spec/outputs/email_spec.rb
61
- homepage: http://logstash.net/
74
+ homepage: http://www.elasticsearch.org/guide/en/logstash/current/index.html
62
75
  licenses:
63
76
  - Apache License (2.0)
64
77
  metadata:
65
78
  logstash_plugin: 'true'
66
- group: output
67
- post_install_message:
79
+ logstash_group: output
80
+ post_install_message:
68
81
  rdoc_options: []
69
82
  require_paths:
70
83
  - lib
71
84
  required_ruby_version: !ruby/object:Gem::Requirement
72
85
  requirements:
73
- - - ! '>='
86
+ - - '>='
74
87
  - !ruby/object:Gem::Version
75
88
  version: '0'
76
89
  required_rubygems_version: !ruby/object:Gem::Requirement
77
90
  requirements:
78
- - - ! '>='
91
+ - - '>='
79
92
  - !ruby/object:Gem::Version
80
93
  version: '0'
81
94
  requirements: []
82
- rubyforge_project:
83
- rubygems_version: 2.4.1
84
- signing_key:
95
+ rubyforge_project:
96
+ rubygems_version: 2.1.9
97
+ signing_key:
85
98
  specification_version: 4
86
99
  summary: Send email when an output is received.
87
100
  test_files:
data/rakelib/publish.rake DELETED
@@ -1,9 +0,0 @@
1
- require "gem_publisher"
2
-
3
- desc "Publish gem to RubyGems.org"
4
- task :publish_gem do |t|
5
- gem_file = Dir.glob(File.expand_path('../*.gemspec',File.dirname(__FILE__))).first
6
- gem = GemPublisher.publish_if_updated(gem_file, :rubygems)
7
- puts "Published #{gem}" if gem
8
- end
9
-
data/rakelib/vendor.rake DELETED
@@ -1,169 +0,0 @@
1
- require "net/http"
2
- require "uri"
3
- require "digest/sha1"
4
-
5
- def vendor(*args)
6
- return File.join("vendor", *args)
7
- end
8
-
9
- directory "vendor/" => ["vendor"] do |task, args|
10
- mkdir task.name
11
- end
12
-
13
- def fetch(url, sha1, output)
14
-
15
- puts "Downloading #{url}"
16
- actual_sha1 = download(url, output)
17
-
18
- if actual_sha1 != sha1
19
- fail "SHA1 does not match (expected '#{sha1}' but got '#{actual_sha1}')"
20
- end
21
- end # def fetch
22
-
23
- def file_fetch(url, sha1)
24
- filename = File.basename( URI(url).path )
25
- output = "vendor/#{filename}"
26
- task output => [ "vendor/" ] do
27
- begin
28
- actual_sha1 = file_sha1(output)
29
- if actual_sha1 != sha1
30
- fetch(url, sha1, output)
31
- end
32
- rescue Errno::ENOENT
33
- fetch(url, sha1, output)
34
- end
35
- end.invoke
36
-
37
- return output
38
- end
39
-
40
- def file_sha1(path)
41
- digest = Digest::SHA1.new
42
- fd = File.new(path, "r")
43
- while true
44
- begin
45
- digest << fd.sysread(16384)
46
- rescue EOFError
47
- break
48
- end
49
- end
50
- return digest.hexdigest
51
- ensure
52
- fd.close if fd
53
- end
54
-
55
- def download(url, output)
56
- uri = URI(url)
57
- digest = Digest::SHA1.new
58
- tmp = "#{output}.tmp"
59
- Net::HTTP.start(uri.host, uri.port, :use_ssl => (uri.scheme == "https")) do |http|
60
- request = Net::HTTP::Get.new(uri.path)
61
- http.request(request) do |response|
62
- fail "HTTP fetch failed for #{url}. #{response}" if [200, 301].include?(response.code)
63
- size = (response["content-length"].to_i || -1).to_f
64
- count = 0
65
- File.open(tmp, "w") do |fd|
66
- response.read_body do |chunk|
67
- fd.write(chunk)
68
- digest << chunk
69
- if size > 0 && $stdout.tty?
70
- count += chunk.bytesize
71
- $stdout.write(sprintf("\r%0.2f%%", count/size * 100))
72
- end
73
- end
74
- end
75
- $stdout.write("\r \r") if $stdout.tty?
76
- end
77
- end
78
-
79
- File.rename(tmp, output)
80
-
81
- return digest.hexdigest
82
- rescue SocketError => e
83
- puts "Failure while downloading #{url}: #{e}"
84
- raise
85
- ensure
86
- File.unlink(tmp) if File.exist?(tmp)
87
- end # def download
88
-
89
- def untar(tarball, &block)
90
- require "archive/tar/minitar"
91
- tgz = Zlib::GzipReader.new(File.open(tarball))
92
- # Pull out typesdb
93
- tar = Archive::Tar::Minitar::Input.open(tgz)
94
- tar.each do |entry|
95
- path = block.call(entry)
96
- next if path.nil?
97
- parent = File.dirname(path)
98
-
99
- mkdir_p parent unless File.directory?(parent)
100
-
101
- # Skip this file if the output file is the same size
102
- if entry.directory?
103
- mkdir path unless File.directory?(path)
104
- else
105
- entry_mode = entry.instance_eval { @mode } & 0777
106
- if File.exists?(path)
107
- stat = File.stat(path)
108
- # TODO(sissel): Submit a patch to archive-tar-minitar upstream to
109
- # expose headers in the entry.
110
- entry_size = entry.instance_eval { @size }
111
- # If file sizes are same, skip writing.
112
- next if stat.size == entry_size && (stat.mode & 0777) == entry_mode
113
- end
114
- puts "Extracting #{entry.full_name} from #{tarball} #{entry_mode.to_s(8)}"
115
- File.open(path, "w") do |fd|
116
- # eof? check lets us skip empty files. Necessary because the API provided by
117
- # Archive::Tar::Minitar::Reader::EntryStream only mostly acts like an
118
- # IO object. Something about empty files in this EntryStream causes
119
- # IO.copy_stream to throw "can't convert nil into String" on JRuby
120
- # TODO(sissel): File a bug about this.
121
- while !entry.eof?
122
- chunk = entry.read(16384)
123
- fd.write(chunk)
124
- end
125
- #IO.copy_stream(entry, fd)
126
- end
127
- File.chmod(entry_mode, path)
128
- end
129
- end
130
- tar.close
131
- File.unlink(tarball) if File.file?(tarball)
132
- end # def untar
133
-
134
- def ungz(file)
135
-
136
- outpath = file.gsub('.gz', '')
137
- tgz = Zlib::GzipReader.new(File.open(file))
138
- begin
139
- File.open(outpath, "w") do |out|
140
- IO::copy_stream(tgz, out)
141
- end
142
- File.unlink(file)
143
- rescue
144
- File.unlink(outpath) if File.file?(outpath)
145
- raise
146
- end
147
- tgz.close
148
- end
149
-
150
- desc "Process any vendor files required for this plugin"
151
- task "vendor" do |task, args|
152
-
153
- @files.each do |file|
154
- download = file_fetch(file['url'], file['sha1'])
155
- if download =~ /.tar.gz/
156
- prefix = download.gsub('.tar.gz', '').gsub('vendor/', '')
157
- untar(download) do |entry|
158
- if !file['files'].nil?
159
- next unless file['files'].include?(entry.full_name.gsub(prefix, ''))
160
- out = entry.full_name.split("/").last
161
- end
162
- File.join('vendor', out)
163
- end
164
- elsif download =~ /.gz/
165
- ungz(download)
166
- end
167
- end
168
-
169
- end