fluent-plugin-syslog_rfc5424 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 978af580385e80f9a1cb5e743d35e6e014eba01c
-  data.tar.gz: 7065e8650da7f66cbe7957b70c15c9a6b4307d15
+  metadata.gz: 3f3e58806594ab10187d2c6909a9ec386b7644dc
+  data.tar.gz: 126da79f294d6843ce53f4b87a8ae2c7caf98a64
 SHA512:
-  metadata.gz: 27d241fa27e04065e6e7d4296a4c1a1c7e8d57f28b9f9c532a430e99740e4dbb5c3b22b309093347997966877867286c5e3e8e5d4663c00768b66bf9ef4f6d85
-  data.tar.gz: 3e59568aa8b186c7cbc3441084399a41cfbbb6275f9deca84890c0646a5e36e7d7ccf8d4fee844b2b868e4e9c1d7dcfbc143dc9a23c67be8a88d25d52a206327
+  metadata.gz: a565e5a16f4b8d9dc4536c116ca37b8059a620c5fa8efa3e2ef2c314ba89ba862e76bf89953cb9e122f951638622559db49146e8421742c6f96412d8de05aee3
+  data.tar.gz: 17917ed6c9720e60e2cbdd4e4776dcb5736f2feddfe77dcefa021f8c8803b034da2078ec7fc40b8eaa29cddfdfc07a8e0570d0b92370fe383c8b5b9d4608572f

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.5.3"
+  spec.version       = "0.6.0"
   spec.authors       = ["Pivotal"]
   spec.email         = %w(cf-loggregator@pivotal.io)
   spec.homepage      = "https://github.com/cloudfoundry/fluent-plugin-syslog_rfc5424"
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "test-unit", "~> 3.3"
   spec.add_development_dependency "test-unit-rr", "~> 1.0"
   spec.add_development_dependency "pry", "~> 0.12"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest", "~> 5.8"
 
   spec.add_runtime_dependency "fluentd", "~> 1.7"
 end

data/lib/fluent/plugin/formatter_syslog_rfc5424.rb

@@ -17,8 +17,8 @@ module Fluent
         msg = RFC5424::Formatter.format(
           log: record['log'],
           timestamp: time,
-          app_name: 'app-guid',
-          proc_id: 'instance-id'
+          app_name: record.dig("kubernetes", "labels", "cloudfoundry.org/app_guid") || "-",
+          proc_id: record.dig("kubernetes", "pod_id") || "-"
         )
 
         log.debug("RFC 5424 Message")

data/test/plugin/formatter_syslog_rfc5424_spec.rb

@@ -17,7 +17,7 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
     tag = "test-formatter"
     time = Fluent::EventTime.new(0, 123456000)
     record = {"log" => "test-log"}
-    assert_equal "<14>1 1970-01-01T00:00:00.123456+00:00 - app-name instance-id - - test-log",
+    assert_equal "<14>1 1970-01-01T00:00:00.123456+00:00 - - - - - test-log",
                  formatter_driver.instance.format(tag, time, record)
   end
 
@@ -29,7 +29,7 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
     tag = "test-formatter"
     time = Fluent::EventTime.new(0, 123456000)
     record = {"log" => "test-log"}
-    assert_equal "<14>1 1970-01-01T00:00:00.123456+00:00 - app-name instance-id - - test-log",
+    assert_equal "<14>1 1970-01-01T00:00:00.123456+00:00 - - - - - test-log",
                  formatter_driver.instance.format(tag, time, record)
   end
 
@@ -42,9 +42,39 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
     time = Fluent::EventTime.new(0, 123456000)
     record = {"log" => "test-log"}
 
-    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - app-name instance-id - - test-log"
+    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
+    )
+    tag = "test-formatter"
+    time = Fluent::EventTime.new(0, 123456000)
+    record = {"log" => "test-log", "kubernetes" => {"labels" => { "cloudfoundry.org/app_guid" => "custom-value"}}}
+
+    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - custom-value - - - test-log"
+    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
+    )
+    tag = "test-formatter"
+    time = Fluent::EventTime.new(0, 123456000)
+    record = {"log" => "test-log", "kubernetes" => {"pod_id" => "custom-value"}}
+
+    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - - custom-value - - test-log"
+    message_size = formatted_message.length
+    assert_equal "#{formatted_message}",
+                 formatter_driver.instance.format(tag, time, record)
+  end
+
+
 end

data/test/plugin/out_syslog_rfc5424_spec.rb

@@ -5,7 +5,7 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
     @time = Fluent::EventTime.new(0, 123456)
-    @formatted_log = "68 <14>1 1970-01-01T00:00:00.000123+00:00 - app-name instance-id - - hi"
+    @formatted_log = "51 <14>1 1970-01-01T00:00:00.000123+00:00 - - - - - hi"
   end
 
   def create_driver(conf = CONFIG)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog_rfc5424
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement