fluent-plugin-syslog_rfc5424 0.7.3.pre.rc.13 → 0.7.3.pre.rc.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7acf509e9410bf4b84bd9d6b171c2c265118b57aec02e92bd18694be1d96d1e
-  data.tar.gz: 30690a976fcbf29abc3489b6b8840cbe49b620a32282df9b3ec6f1fe459f6012
+  metadata.gz: 3f3898feebffff9f054054d6389e71b31d47c9555ae2773ef52e1357615d36c5
+  data.tar.gz: 17a959dfa916bac88c3b03397dc9ecc070a00dcab19b2e54566bc56591fd4b43
 SHA512:
-  metadata.gz: 25837f25d6f7ae52d6f1078411f4d2d90fe23a72db113bd79991bca6e9393eeae0a8d0040b44caacec28b7602e4dce8944122fc1a355180b793fb82433856d8c
-  data.tar.gz: bebcbfcb3cc3a3aed501181786d674f19d1c5659ceb1980c182e0ea6a8148265e6eda2476ea49fea7244cabb84a876eb87c5bb723e9db81ce6f3ba28760ef6a8
+  metadata.gz: 041d7a2b70697aa88c6346b41712daaf7ee120f9a00793c7808a5d456aca04e29e5ed6e44e093488376973f865d3b7d52bb6f5ef9429a5586e89bbbdb91e674e
+  data.tar.gz: a00ca75526947ad4e8c6966859f87155dc8d589612165dd978e86ec8d860abcd95880047f11ebf63ba92d82d94e609b778abf83420f8da1ede49e7c8135f1068

data/.ruby-version

@@ -1 +1 @@
-2.4.2
+2.5.7

data/lib/fluent/plugin/formatter_syslog_rfc5424.rb

@@ -6,13 +6,21 @@ module Fluent
       Fluent::Plugin.register_formatter('syslog_rfc5424', self)
 
       config_param :rfc6587_message_size, :bool, default: true
+      config_param :hostname_field, :string, default: "hostname"
       config_param :app_name_field, :string, default: "app_name"
       config_param :proc_id_field, :string, default: "proc_id"
+      config_param :message_id_field, :string, default: "message_id"
+      config_param :structured_data_field, :string, default: "structured_data"
+      config_param :log_field, :string, default: "log"
 
       def configure(conf)
         super
+        @hostname_field_array = @hostname_field.split(".")
         @app_name_field_array = @app_name_field.split(".")
         @proc_id_field_array = @proc_id_field.split(".")
+        @message_id_field_array = @message_id_field.split(".")
+        @structured_data_field_array = @structured_data_field.split(".")
+        @log_field_array = @log_field.split(".")
       end
 
       def format(tag, time, record)
@@ -20,10 +28,13 @@ module Fluent
         log.debug(record.map { |k, v| "#{k}=#{v}" }.join('&'))
 
         msg = RFC5424::Formatter.format(
-          log: record['log'],
+          log: record.dig(*@log_field_array) || "-",
           timestamp: time,
+          hostname: record.dig(*@hostname_field_array) || "-",
           app_name: record.dig(*@app_name_field_array) || "-",
-          proc_id: record.dig(*@proc_id_field_array) || "-"
+          proc_id: record.dig(*@proc_id_field_array) || "-",
+          msg_id: record.dig(*@message_id_field_array) || "-",
+          sd: record.dig(*@structured_data_field_array) || "-"
         )
 
         log.debug("RFC 5424 Message")
@@ -35,4 +46,4 @@ module Fluent
       end
     end
   end
-end
+end

data/lib/fluent-plugin-syslog_rfc5424/version.rb

@@ -1,3 +1,3 @@
 module FluentSyslog5424OutputPlugin
-  VERSION = "0.7.3-rc.13"
+  VERSION = "0.7.3-rc.14"
 end

data/test/plugin/formatter_syslog_rfc5424_spec.rb

@@ -65,6 +65,54 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
                  formatter_driver.instance.format(tag, time, record)
   end
 
+  def test_format_with_log_field
+    formatter_driver = create_driver %(
+      @type syslog_rfc5424
+      rfc6587_message_size false
+      log_field example.custom_field
+    )
+    tag = "test-formatter"
+    time = Fluent::EventTime.new(0, 123456000)
+    record = {"log" => "test-log", "example" => {"custom_field" => "custom-value"}}
+
+    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - - - - - custom-value\n"
+    message_size = formatted_message.length
+    assert_equal "#{formatted_message}",
+                 formatter_driver.instance.format(tag, time, record)
+  end
+
+  def test_format_with_structured_data
+    formatter_driver = create_driver %(
+      @type syslog_rfc5424
+      rfc6587_message_size false
+      structured_data_field example.custom_field
+    )
+    tag = "test-formatter"
+    time = Fluent::EventTime.new(0, 123456000)
+    record = {"log" => "test-log", "example" => {"custom_field" => "custom-value"}}
+
+    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - - - - custom-value test-log\n"
+    message_size = formatted_message.length
+    assert_equal "#{formatted_message}",
+                 formatter_driver.instance.format(tag, time, record)
+  end
+
+  def test_format_with_hostname
+    formatter_driver = create_driver %(
+      @type syslog_rfc5424
+      rfc6587_message_size false
+      hostname_field example.custom_field
+    )
+    tag = "test-formatter"
+    time = Fluent::EventTime.new(0, 123456000)
+    record = {"log" => "test-log", "example" => {"custom_field" => "custom-value"}}
+
+    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 custom-value - - - - test-log\n"
+    message_size = formatted_message.length
+    assert_equal "#{formatted_message}",
+                 formatter_driver.instance.format(tag, time, record)
+  end
+
   def test_format_with_proc_id
     formatter_driver = create_driver %(
       @type syslog_rfc5424
@@ -81,5 +129,20 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
                  formatter_driver.instance.format(tag, time, record)
   end
 
+  def test_format_with_message_id
+    formatter_driver = create_driver %(
+      @type syslog_rfc5424
+      rfc6587_message_size false
+      message_id_field example.custom_field
+    )
+    tag = "test-formatter"
+    time = Fluent::EventTime.new(0, 123456000)
+    record = {"log" => "test-log", "example" => {"custom_field" => "custom-value"}}
+
+    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - - - custom-value - test-log\n"
+    message_size = formatted_message.length
+    assert_equal "#{formatted_message}",
+                 formatter_driver.instance.format(tag, time, record)
+  end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog_rfc5424
 version: !ruby/object:Gem::Version
-  version: 0.7.3.pre.rc.13
+  version: 0.7.3.pre.rc.14
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler