fluent-plugin-syslog_rfc5424 0.7.0 → 0.7.1.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6c2a7e27ac573735e5cdfb190c0ebe9b5be330b
-  data.tar.gz: 6c8c1dd62b0dac4917b751e2458a21dee022aa52
+  metadata.gz: 4f20adbe28656d64f9ad85d6ef642df03387a153
+  data.tar.gz: 80af7c193d2aad826f2d44f7d1adc9f1fd5658b7
 SHA512:
-  metadata.gz: c7766465f1c7aa0f37e4e67cdc3eda168b1808ca8e1aada5b42c6fa26e2319ab6ca0dde93bc3616ef72fa87a0423196139e40bd90573e62b2ac4d06fe01d2ee8
-  data.tar.gz: '0238772ac572669f1194d68cf0b9e65d1108bbbc3a0ca08d88def67863de93aab8fd1de83ff23bd91ef31c983c3e8226d3111dcd5fc85d2ebd3ce578c56729f6'
+  metadata.gz: 21473d51186b0512828bcb3981a723e7479d762804aa84627388193a46a2bd0b743e7ef6197109b1024ef9f6c4f8291985d88fcc35d3f36cfb306234c4742c84
+  data.tar.gz: 2867cc9f1b2e9274bad415149e7e4faa567eca8eafa4606cad6f469f5ce5139d1fa43fd6bc4cf385b353eb5f9b296cc6c553677887a783ca2a36ea4f528e2fb9

data/.gitignore

@@ -11,4 +11,7 @@
 # rspec failure tracking
 .rspec_status
 
+#binary
+fluent-plugin-syslog_rfc5424-*.gem
+
 Gemfile.lock

data/README.md

@@ -39,11 +39,13 @@ Or install it yourself as:
 
 ### Configuration
 
-| name              | type       | placeholder support | description                               |
-| --------------    | -------    | -----------         | ---------------------------------         |
-| host              | string     |                     | syslog target host                        |
-| port              | integer    |                     | syslog target port                        |
-| transport         | string     |                     | transport protocol (tls [default], udp, or tcp)     |
+| name              | type       | description                               |
+| --------------    | -------    | ---------------------------------         |
+| host              | string     | syslog target host                        |
+| port              | integer    | syslog target port                        |
+| transport         | string     | transport protocol (tls [default], udp, or tcp) |
+| insecure          | boolean    | skip ssl validation |
+| trusted_ca_path   | string     | file path to ca to trust |
 
 #### Format Section
 
@@ -52,25 +54,23 @@ Defaults to `syslog_rfc5424`
 | name                      |type     | description |
 | --------------            | ------- | -------     |
 | rfc6587_message_size      | boolean | prepends message length for syslog transmission (true by default)  |
+| app_name_field            | string  | sets app name in syslog from field in fluentd, delimited by '.' (default app_name) |
+| proc_id_field             | string  | sets proc id in syslog from field in fluentd, delimited by '.' (default proc_id) |
 
 
 ## Formatter Usage
 
 ```
 <match **>
-  @type example
+  @type syslog_rfc5424
   <format>
     @type syslog_rfc5424
+    app_name_field example.custom_field_1
+    proc_id_field example.custom_field_2
   </format>
 </match>
 ```
 
-### Configuration
-
-| name                      |type     | description |
-| --------------            | ------- | -------     |
-| rfc6587_message_size      | boolean | prepends message length for syslog transmission (false by default)  |
-
 
 ## Development
 

data/fluent-plugin-syslog_rfc5424.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-syslog_rfc5424"
-  spec.version       = "0.7.0"
+  spec.version       = "0.7.1.alpha1"
   spec.authors       = ["Pivotal"]
   spec.email         = %w(cf-loggregator@pivotal.io)
   spec.homepage      = "https://github.com/cloudfoundry/fluent-plugin-syslog_rfc5424"

data/lib/fluent/plugin/formatter_syslog_rfc5424.rb

@@ -5,7 +5,7 @@ module Fluent
     class FormatterSyslogRFC5424 < Formatter
       Fluent::Plugin.register_formatter('syslog_rfc5424', self)
 
-      config_param :rfc6587_message_size, :bool, default: false
+      config_param :rfc6587_message_size, :bool, default: true
       config_param :app_name_field, :string, default: "app_name"
       config_param :proc_id_field, :string, default: "proc_id"
 
@@ -33,7 +33,7 @@ module Fluent
         log.debug(msg)
 
         return msg unless @rfc6587_message_size
-
+        msg.delete!("\n")
         msg.length.to_s + ' ' + msg
       end
     end

data/lib/fluent/plugin/out_syslog_rfc5424.rb

@@ -15,7 +15,6 @@ module Fluent
       config_param :trusted_ca_path, :string, default: nil
       config_section :format do
         config_set_default :@type, DEFAULT_FORMATTER
-        config_set_default :rfc6587_message_size, true
       end
 
       def configure(config)
@@ -28,7 +27,12 @@ module Fluent
         socket = find_or_create_socket(@transport.to_sym, @host, @port)
         tag = chunk.metadata.tag
         chunk.each do |time, record|
-          socket.puts @formatter.format(tag, time, record)
+          begin
+            socket.puts @formatter.format(tag, time, record)
+          rescue
+            @sockets[socket_key(@transport.to_sym, @host, @port)] = nil
+            raise
+          end
         end
       end
 

data/test/plugin/formatter_syslog_rfc5424_spec.rb

@@ -13,6 +13,7 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
   def test_format_default
     formatter_driver = create_driver %(
       @type syslog_rfc5424
+      rfc6587_message_size false
     )
     tag = "test-formatter"
     time = Fluent::EventTime.new(0, 123456000)
@@ -48,10 +49,26 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
                  formatter_driver.instance.format(tag, time, record)
   end
 
+  def test_format_with_message_size_and_new_line
+    formatter_driver = create_driver %(
+      @type syslog_rfc5424
+      rfc6587_message_size true
+    )
+    tag = "test-formatter"
+    time = Fluent::EventTime.new(0, 123456000)
+    record = {"log" => "test-log\n\n"}
+
+    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - - - - - test-log"
+    message_size = formatted_message.length
+    assert_equal "#{message_size} #{formatted_message}",
+                 formatter_driver.instance.format(tag, time, record)
+  end  
+
   def test_format_with_app_name
     formatter_driver = create_driver %(
       @type syslog_rfc5424
       app_name_field example.custom_field
+      rfc6587_message_size false
     )
     tag = "test-formatter"
     time = Fluent::EventTime.new(0, 123456000)
@@ -67,6 +84,7 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
     formatter_driver = create_driver %(
       @type syslog_rfc5424
       proc_id_field example.custom_field
+      rfc6587_message_size false
     )
     tag = "test-formatter"
     time = Fluent::EventTime.new(0, 123456000)

data/test/plugin/out_syslog_rfc5424_spec.rb

@@ -43,6 +43,34 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     end
   end
 
+  def test_reconnects
+    output_driver = create_driver %(
+      @type syslog_rfc5424
+      host example.com
+      port 123
+    )
+
+    bad_socket = Minitest::Mock.new
+    mock(bad_socket).puts(@formatted_log) {
+      raise StandardError
+    }
+    stub(bad_socket).close
+
+
+    good_socket = Minitest::Mock.new
+    mock(good_socket).puts(@formatted_log)
+    stub(good_socket).close
+
+    any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
+      mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>nil}).returns(bad_socket)
+      mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>nil}).returns(good_socket)
+    end
+
+    output_driver.run(shutdown: false, force_flush_retry: true) do
+      output_driver.feed("tag", @time, {"log" => "hi"})
+    end
+  end
+
   def test_non_tls
     output_driver = create_driver %(
       @type syslog_rfc5424

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog_rfc5424
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1.alpha1
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,9 +145,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13