logstash-output-gelf 0.1.0 → 0.1.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NzM4ZThmM2ExMGUxY2IwYzUxM2JjZjk1MDkyZDNjMjA0MTY3ZmY5NA==
5
- data.tar.gz: !binary |-
6
- MWY4NTRlN2IwMTE0NjQ5N2Y4ZjUwMWY1ZmI5ZTk4MmEwM2M0Yzc1OQ==
2
+ SHA1:
3
+ metadata.gz: 692a1d317b632ec37dfe2f3bbaf01144f6028446
4
+ data.tar.gz: a928ff20382a304415bae833988d9bef46e70e6c
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- MzNkMjhlZDNmNzY4Zjc2NjUxOTVlMWM4NmU0YmRlZWM4MTIxYmY3YjVjNDZh
10
- NjkwZDA5NTBiYTViODg0NzY2MjRlY2M3MWEzN2ZiNjNmYzAwMmViOTUzOWQ3
11
- ZDAzYjkzMjUxZjNlNmRkYWJjYjAyNjU4MzBjZTJmZTA3MWVlMmU=
12
- data.tar.gz: !binary |-
13
- MDFhYTYxN2VjMjVjZWMxNjZhN2FkN2NjYmZkY2NmNTM0MzIyMjQ4NTBlNDgx
14
- NmRmMzQ1ZjEyMjEzMzZiNTY0YWY1NjQyMzBlNTZhYzhiMjJlMDZhOWFjYTQ0
15
- NDcwMjU5MWJhYzMxOTg2YmE5ODNhMmY5NWNhMTY4MjM2MTU1MDY=
6
+ metadata.gz: 4f5120dc469cd17270c26280a08e77d2c7898a503d4900a297b31ce8157d0204cc06d0d325c7001f8511f7b7dc71d5b144ed967aed154c287c8c546592c29615
7
+ data.tar.gz: 76361225676afa73b157a693555292bcc36ff5fef90663db20483960308eb42e0e96fdbafd530f60b3e44bc54f85e68a618b3b48d0f0fda53afa05a4ca91b161
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/Rakefile CHANGED
@@ -4,3 +4,4 @@ task :default do
4
4
  system("rake -T")
5
5
  end
6
6
 
7
+ require "logstash/devutils/rake"
@@ -5,7 +5,7 @@ require "logstash/outputs/base"
5
5
  # This output generates messages in GELF format. This is most useful if you
6
6
  # want to use Logstash to output events to Graylog2.
7
7
  #
8
- # More information at <http://graylog2.org/gelf#specs>
8
+ # More information at http://graylog2.org/gelf#specs[The Graylog2 GELF specs page]
9
9
  class LogStash::Outputs::Gelf < LogStash::Outputs::Base
10
10
 
11
11
  config_name "gelf"
@@ -26,7 +26,7 @@ class LogStash::Outputs::Gelf < LogStash::Outputs::Base
26
26
  # instead of the hostname.
27
27
  config :sender, :validate => :string, :default => "%{host}"
28
28
 
29
- # The GELF message level. Dynamic values like %{level} are permitted here;
29
+ # The GELF message level. Dynamic values like `%{level}` are permitted here;
30
30
  # useful if you want to parse the 'log level' from an event and use that
31
31
  # as the GELF level/severity.
32
32
  #
@@ -39,19 +39,19 @@ class LogStash::Outputs::Gelf < LogStash::Outputs::Base
39
39
  # "informational".
40
40
  config :level, :validate => :array, :default => [ "%{severity}", "INFO" ]
41
41
 
42
- # The GELF facility. Dynamic values like %{foo} are permitted here; this
42
+ # The GELF facility. Dynamic values like `%{foo}` are permitted here; this
43
43
  # is useful if you need to use a value from the event as the facility name.
44
44
  # Should now be sent as an underscored "additional field" (e.g. `\_facility`)
45
45
  config :facility, :validate => :string, :deprecated => true
46
46
 
47
47
  # The GELF line number; this is usually the line number in your program where
48
- # the log event originated. Dynamic values like %{foo} are permitted here, but the
48
+ # the log event originated. Dynamic values like `%{foo}` are permitted here, but the
49
49
  # value should be a number.
50
50
  # Should now be sent as an underscored "additional field" (e.g. `\_line`).
51
51
  config :line, :validate => :string, :deprecated => true
52
52
 
53
53
  # The GELF file; this is usually the source code file in your program where
54
- # the log event originated. Dynamic values like %{foo} are permitted here.
54
+ # the log event originated. Dynamic values like `%{foo}` are permitted here.
55
55
  # Should now be sent as an underscored "additional field" (e.g. `\_file`).
56
56
  config :file, :validate => :string, :deprecated => true
57
57
 
@@ -70,11 +70,11 @@ class LogStash::Outputs::Gelf < LogStash::Outputs::Base
70
70
 
71
71
  # The GELF custom field mappings. GELF supports arbitrary attributes as custom
72
72
  # fields. This exposes that. Exclude the `_` portion of the field name
73
- # e.g. `custom_fields => ['foo_field', 'some_value']
73
+ # e.g. `custom_fields => ['foo_field', 'some_value']`
74
74
  # sets `_foo_field` = `some_value`.
75
75
  config :custom_fields, :validate => :hash, :default => {}
76
76
 
77
- # The GELF full message. Dynamic values like %{foo} are permitted here.
77
+ # The GELF full message. Dynamic values like `%{foo}` are permitted here.
78
78
  config :full_message, :validate => :string, :default => "%{message}"
79
79
 
80
80
  # The GELF short message field name. If the field does not exist or is empty,
@@ -1,13 +1,13 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-output-gelf'
4
- s.version = '0.1.0'
4
+ s.version = '0.1.1'
5
5
  s.licenses = ['Apache License (2.0)']
6
6
  s.summary = "This output generates messages in GELF format."
7
- s.description = "This output generates messages in GELF format. This is most useful if you want to use Logstash to output events to Graylog2."
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 'gelf', ['1.3.2']
26
26
 
27
+ s.add_development_dependency 'logstash-devutils'
27
28
  end
28
29
 
@@ -1 +1 @@
1
- require 'spec_helper'
1
+ require "logstash/devutils/rspec/spec_helper"
metadata CHANGED
@@ -1,52 +1,65 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-gelf
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-06 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: gelf
35
34
  requirement: !ruby/object:Gem::Requirement
36
35
  requirements:
37
36
  - - '='
38
37
  - !ruby/object:Gem::Version
39
38
  version: 1.3.2
40
- type: :runtime
39
+ name: gelf
41
40
  prerelease: false
41
+ type: :runtime
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - '='
45
45
  - !ruby/object:Gem::Version
46
46
  version: 1.3.2
47
- description: This output generates messages in GELF format. This is most useful if
48
- you want to use Logstash to output events to Graylog2.
49
- email: richard.pijnenburg@elasticsearch.com
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
54
+ prerelease: false
55
+ type: :development
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ requirements:
58
+ - - '>='
59
+ - !ruby/object:Gem::Version
60
+ version: '0'
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
50
63
  executables: []
51
64
  extensions: []
52
65
  extra_rdoc_files: []
@@ -57,33 +70,31 @@ files:
57
70
  - Rakefile
58
71
  - lib/logstash/outputs/gelf.rb
59
72
  - logstash-output-gelf.gemspec
60
- - rakelib/publish.rake
61
- - rakelib/vendor.rake
62
73
  - spec/outputs/gelf_spec.rb
63
- homepage: http://logstash.net/
74
+ homepage: http://www.elasticsearch.org/guide/en/logstash/current/index.html
64
75
  licenses:
65
76
  - Apache License (2.0)
66
77
  metadata:
67
78
  logstash_plugin: 'true'
68
- group: output
69
- post_install_message:
79
+ logstash_group: output
80
+ post_install_message:
70
81
  rdoc_options: []
71
82
  require_paths:
72
83
  - lib
73
84
  required_ruby_version: !ruby/object:Gem::Requirement
74
85
  requirements:
75
- - - ! '>='
86
+ - - '>='
76
87
  - !ruby/object:Gem::Version
77
88
  version: '0'
78
89
  required_rubygems_version: !ruby/object:Gem::Requirement
79
90
  requirements:
80
- - - ! '>='
91
+ - - '>='
81
92
  - !ruby/object:Gem::Version
82
93
  version: '0'
83
94
  requirements: []
84
- rubyforge_project:
85
- rubygems_version: 2.4.1
86
- signing_key:
95
+ rubyforge_project:
96
+ rubygems_version: 2.1.9
97
+ signing_key:
87
98
  specification_version: 4
88
99
  summary: This output generates messages in GELF format.
89
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