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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3f3898feebffff9f054054d6389e71b31d47c9555ae2773ef52e1357615d36c5
-  data.tar.gz: 17a959dfa916bac88c3b03397dc9ecc070a00dcab19b2e54566bc56591fd4b43
+SHA1:
+  metadata.gz: 678c7679f9c40aed9163e9a96c81ab956cfb8ddb
+  data.tar.gz: 20ff60bbf06f1780dc17c49e54ec05cc9bdae4b7
 SHA512:
-  metadata.gz: 041d7a2b70697aa88c6346b41712daaf7ee120f9a00793c7808a5d456aca04e29e5ed6e44e093488376973f865d3b7d52bb6f5ef9429a5586e89bbbdb91e674e
-  data.tar.gz: a00ca75526947ad4e8c6966859f87155dc8d589612165dd978e86ec8d860abcd95880047f11ebf63ba92d82d94e609b778abf83420f8da1ede49e7c8135f1068
+  metadata.gz: 9bce27bd480431a126c9f493802ff438a25866c259adfa8366168f567e66e301f7a01c64e1409e21923a4c0e7588c7bad911a76a2e9785aa5c0088735b25a154
+  data.tar.gz: 71080495b53c144288b384c20791889287e62d21686f7fd78c1b982d3ce629e07dbdc5749af0dfd48dc3d29365dbe0a928b157abff5cea25401f25ce3ce8c7e3

data/.ruby-version

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

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
 require 'rake/testtask'
-require 'fluent-plugin-syslog_rfc5424/version'
 
 Rake::TestTask.new(:test) do |test|
   test.libs << "lib" << "test"
@@ -9,7 +8,3 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task default: :test
-
-task :version do
-  puts FluentSyslog5424OutputPlugin::VERSION
-end

data/fluent-plugin-syslog_rfc5424.gemspec

@@ -1,10 +1,10 @@
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fluent-plugin-syslog_rfc5424/version'
+
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-syslog_rfc5424"
-  spec.version       = FluentSyslog5424OutputPlugin::VERSION
+  spec.version       = "0.7.3"
   spec.authors       = ["Pivotal"]
   spec.email         = %w(cf-loggregator@pivotal.io)
   spec.homepage      = "https://github.com/cloudfoundry/fluent-plugin-syslog_rfc5424"
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "test-unit", "~> 3.3"
   spec.add_development_dependency "test-unit-rr", "~> 1.0"
   spec.add_development_dependency "pry", "~> 0.12"

data/lib/fluent/plugin/formatter_syslog_rfc5424.rb

@@ -6,21 +6,13 @@ 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)
@@ -28,13 +20,10 @@ module Fluent
         log.debug(record.map { |k, v| "#{k}=#{v}" }.join('&'))
 
         msg = RFC5424::Formatter.format(
-          log: record.dig(*@log_field_array) || "-",
+          log: record['log'],
           timestamp: time,
-          hostname: record.dig(*@hostname_field_array) || "-",
           app_name: record.dig(*@app_name_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) || "-"
+          proc_id: record.dig(*@proc_id_field_array) || "-"
         )
 
         log.debug("RFC 5424 Message")
@@ -46,4 +35,4 @@ module Fluent
       end
     end
   end
-end
+end

data/test/plugin/formatter_syslog_rfc5424_spec.rb

@@ -65,54 +65,6 @@ 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
@@ -129,20 +81,5 @@ 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.14
+  version: 0.7.3
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,6 @@ files:
 - README.md
 - Rakefile
 - fluent-plugin-syslog_rfc5424.gemspec
-- lib/fluent-plugin-syslog_rfc5424/version.rb
 - lib/fluent/plugin/formatter_syslog_rfc5424.rb
 - lib/fluent/plugin/out_syslog_rfc5424.rb
 - lib/rfc5424/formatter.rb
@@ -146,11 +145,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: FluentD output plugin to send messages via rfc5424

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

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