fluent-plugin-gelf-hs 1.0.2 → 1.0.3

data/README.md

@@ -16,6 +16,8 @@ gem install fluent-plugin-gelf-hs
   host <remote GELF host>
   port <remote GELF port>
   protocol <tcp or udp (default)>
+  tls <true or false (default)>
+  tls_options <{} (default)> for options see https://github.com/graylog-labs/gelf-rb/blob/72916932b789f7a6768c3cdd6ab69a3c942dbcef/lib/gelf/transport/tcp_tls.rb#L7-L12
   [ fluent buffered output plugin configuration ]
 </match>
 ```

data/fluent-plugin-gelf-hs.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-gelf-hs"
-  s.version     = "1.0.2"
+  s.version   = ENV.key?('RUBYGEM_VERSION') ? ENV['RUBYGEM_VERSION'] : '1.0.3'
   s.authors     = ["Alex Yamauchi", "Eric Searcy"]
   s.email       = ["oss@hotschedules.com"]
   s.homepage    = "https://github.com/bodhi-space/fluent-plugin-gelf-hs"
@@ -21,13 +21,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "fluentd"
   s.add_runtime_dependency "gelf", ">= 2.0.0"
 
-  ## Disabling since this appears to have a gem version dependencey.
-  ## This type of metadata is not supported by gem, but can be incorporated
-  ## by other packaging systems (ie. rpm).
-  #s.metadata = {
-  #  'provides' => 'fluent-plugin-gelf = 0.1.0',
-  #  'conflicts' => 'fluent-plugin-gelf'
-  #}
-  s.signing_key = File.expand_path('~/certs/oss@hotschedules.com.key') if $0 =~ /gem\z/
+  s.signing_key = File.expand_path( ENV.key?('RUBYGEM_SIGNING_KEY') ? ENV['RUBYGEM_SIGNING_KEY'] : '~/certs/oss@hotschedules.com.key' ) if $0 =~ /\bgem[\.0-9]*\z/
   s.cert_chain    = %w[certs/oss@hotschedules.com.cert]
 end

data/lib/fluent/plugin/out_gelf.rb

@@ -13,6 +13,8 @@ module Fluent
     config_param :host, :string, :default => nil
     config_param :port, :integer, :default => 12201
     config_param :protocol, :string, :default => 'udp'
+    config_param :tls, :bool, :default => false
+    config_param :tls_options, :hash, :default => {}
 
     def initialize
       super
@@ -35,7 +37,15 @@ module Fluent
     def start
       super
 
-      @conn = GELF::Notifier.new(@host, @port, 'WAN', {:facility => 'fluentd', :protocol => @proto})
+      options = {:facility => 'fluentd', :protocol => @proto}
+
+      # add tls key (tls_options) only when tls = True
+      # see https://github.com/graylog-labs/gelf-rb/blob/72916932b789f7a6768c3cdd6ab69a3c942dbcef/lib/gelf/notifier.rb#L133-L140
+      if @tls then
+        options[:tls] = @tls_options
+      end
+
+      @conn = GELF::Notifier.new(@host, @port, 'WAN', options)
 
       # Errors are not coming from Ruby so we use direct mapping
       @conn.level_mapping = 'direct'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fluent-plugin-gelf-hs
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Alex Yamauchi
@@ -42,7 +42,7 @@ cert_chain:
   2Zk648Ep9HVPKmwoVuB75+xEQw==
   -----END CERTIFICATE-----
 
-date: 2017-03-17 00:00:00 Z
+date: 2017-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fluentd