fluent-plugin-nats 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37e3edf9206fe66e157aa2c2d8a0ae58e2f5d934
-  data.tar.gz: 22a579e710b96489e1a29cb67f7982409a7f5b6e
+SHA256:
+  metadata.gz: 52d1ac0b1fcd215901c291dfa34699e6d86eefdd35bcd33533f1dd5313f0d099
+  data.tar.gz: 86fb83fb117dad3a4504122ea426fefd59ddd756b65d1e88aaa0cb642ef255f3
 SHA512:
-  metadata.gz: 20518c485938cf956976a732cfe8c3c64162834af602aac5dc0eb926c64942f9308933e8de083366aa22c25442122f8941abb14c48ec686fce587e0393e82215
-  data.tar.gz: 5a6b040380c3787da130b05d3a5c9bf93bda73e4d112289d56744714d5d4ee4f5e245a05a60d98c9f81bcd9d549fe951ad8336a17e000f88c9623cf40661d88a
+  metadata.gz: 935af9de50cd0525c872e1918a2da8e3a4a3b63f7d65d704cb7fd7fa46ce78f69970107e99840c79a9fc2c3631490f71f5fc7dba93ef64c5c04ce4c4db49f7d4
+  data.tar.gz: 439200145ab53e23a9f33d2754d8930fc5076ab63a32b952a282f46bca37a38e8ad9b8444c1ea06a1d837112533534addda1fd37c11e4437f33dca7cceacc867

data/README.md

@@ -4,7 +4,7 @@ fluent-plugin-nats
 [NATS](https://github.com/derekcollison/nats) plugin for
 [fluentd](https://github.com/fluent/fluentd) Event Collector
 
-[![Build Status](https://secure.travis-ci.org/achied/fluent-plugin-nats.png)](http://travis-ci.org/achied/fluent-plugin-nats)
+[![Build Status](https://travis-ci.org/cloudfoundry-community/fluent-plugin-nats.svg?branch=master)](https://travis-ci.org/cloudfoundry-community/fluent-plugin-nats)
 
 ## Requirements
 

data/fluent-plugin-nats.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-nats"
-  gem.version     = "1.0.0"
+  gem.version     = "1.1.0"
   gem.authors     = ["Eduardo Aceituno"]
   gem.email       = ["achied@gmail.com"]
   gem.homepage    = "https://github.com/achied/fluent-plugin-nats"
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "eventmachine", ">= 0.12.10"
-  gem.add_dependency "fluentd", ">= 0.14.20"
+  gem.add_dependency "fluentd", ">= 0.14.20", "< 2"
   gem.add_dependency "nats", ">= 0.4.22"
 
   gem.add_development_dependency "rake", ">= 0.9.2"

data/lib/fluent/plugin/in_nats.rb

@@ -10,12 +10,12 @@ module Fluent
 
       desc "NATS server hostname"
       config_param :host, :string, default: "localhost"
+      desc "NATS server port"
+      config_param :port, :integer, default: 4222
       desc "Username for authorized connection"
       config_param :user, :string, default: "nats"
       desc "Password for authorized connection"
       config_param :password, :string, default: "nats", secret: true
-      desc "NATS server port"
-      config_param :port, :integer, default: 4222
       desc "Subscribing queue names"
       config_param :queues, :array, default: ["fluent.>"]
       config_param :queue, :string, default: "fluent.>", obsoleted: "Use `queues` instead"
@@ -43,8 +43,9 @@ module Fluent
 
       def start
         super
-        NATS.on_error do |error_message|
-          log.error "Server Error: #{error_message}"
+        NATS.on_error do |error|
+          log.error "Server Error:", error: error
+          # supervisor will restart worker
           exit!
         end
         run_reactor_thread

data/lib/fluent/plugin/out_nats.rb

@@ -0,0 +1,90 @@
+require "fluent/plugin/output"
+require "nats/client"
+
+module Fluent
+  module Plugin
+    class NATSOutput < Fluent::Plugin::Output
+      Fluent::Plugin.register_output('nats', self)
+
+      helpers :formatter, :thread, :inject
+
+      DEFAULT_FORMAT_TYPE = 'json'
+
+      desc "NATS server hostname"
+      config_param :host, :string, default: "localhost"
+      desc "NATS server port"
+      config_param :port, :integer, default: 4222
+      desc "Username for authorized connection"
+      config_param :user, :string, default: "nats"
+      desc "Password for authorized connection"
+      config_param :password, :string, default: "nats", secret: true
+      desc "Enable secure SSL/TLS connection"
+      config_param :ssl, :bool, default: false
+      desc "The max number of reconnect tries"
+      config_param :max_reconnect_attempts, :integer, default: 150
+      desc "The number of seconds to wait between reconnect tries"
+      config_param :reconnect_time_wait, :integer, default: 2
+
+      config_section :format do
+        config_set_default :@type, DEFAULT_FORMAT_TYPE
+        config_set_default :add_newline, false
+      end
+
+      def multi_workers_ready?
+        true
+      end
+
+      attr_accessor :formatter
+
+      def configure(conf)
+        super
+
+        @nats_config = {
+          uri: "nats://#{@host}:#{@port}",
+          ssl: @ssl,
+          user: @user,
+          pass: @password,
+          reconnect_time_wait: @reconnect_time_wait,
+          max_reconnect_attempts: @max_reconnect_attempts,
+        }
+        @formatter = formatter_create
+      end
+
+      def start
+        super
+        thread_create(:nats_output_main, &method(:run))
+      end
+
+      def shutdown
+        EM.next_tick do
+          NATS.stop
+        end
+        super
+      end
+
+      def run
+        NATS.on_error do |error|
+          log.error "Server Error:", error: error
+          # supervisor will restart worker
+          exit!
+        end
+        NATS.start(@nats_config) do
+          log.info "nats client is running for #{@nats_config[:uri]}"
+        end
+      end
+
+      def process(tag, es)
+        es = inject_values_to_event_stream(tag, es)
+        es.each do |time,record|
+          EM.next_tick do
+            NATS.publish(tag, format(tag, time, record))
+          end
+        end
+      end
+
+      def format(tag, time, record)
+        @formatter.format(tag, time, record)
+      end
+    end
+  end
+end

data/test/plugin/test_out_nats.rb

@@ -0,0 +1,80 @@
+require "test_helper"
+require "fluent/test/driver/output"
+require "fluent/test/driver/input"
+require "fluent/plugin/out_nats"
+require "fluent/plugin/in_nats"
+require "fluent/time"
+
+class NATSOutputTest < Test::Unit::TestCase
+  include NATSTestHelper
+
+  CONFIG = %[
+    port 4222
+    host localhost
+    user nats
+    password nats
+  ]
+
+  CONFIG_INPUT = CONFIG + %[
+    queues test.>
+    tag nats
+  ]
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::NATSOutput).configure(conf)
+  end
+
+  def create_input_driver(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::NATSInput).configure(conf)
+  end
+
+  def setup
+    Fluent::Test.setup
+    @time = Time.parse("2011-01-02 13:14:15 UTC")
+    Timecop.freeze(@time)
+  end
+
+  def teardown
+    Timecop.return
+  end
+
+  test "configuration test" do
+    d = create_driver(CONFIG)
+    assert_equal 4222, d.instance.port
+    assert_equal "localhost", d.instance.host
+    assert_equal "nats", d.instance.user
+    assert_equal "nats", d.instance.password
+  end
+
+  test "publish an event to NATS" do
+    d = create_driver(CONFIG)
+    input_driver = create_input_driver(CONFIG_INPUT)
+
+    time = Fluent::EventTime.now
+
+    uri = generate_uri(d)
+
+    run_server(uri) do
+      input_driver.run(expect_records: 1) do
+        d.run(default_tag: 'test.log') do
+          d.feed(time, {"test" => "test1"})
+        end
+      end
+    end
+    event = input_driver.events[0]
+    assert_equal(event[0], 'nats.test.log')
+    assert_equal(event[2], {"test" => "test1"})
+  end
+
+  def generate_uri(driver)
+    user = driver.instance.user
+    pass = driver.instance.password
+    host = driver.instance.host
+    port = driver.instance.port
+    if user && pass
+      "nats://#{user}:#{pass}@#{host}:#{port}"
+    else
+      "nats://#{host}:#{port}"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nats
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Eduardo Aceituno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.20
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.20
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
@@ -109,8 +115,10 @@ files:
 - Rakefile
 - fluent-plugin-nats.gemspec
 - lib/fluent/plugin/in_nats.rb
+- lib/fluent/plugin/out_nats.rb
 - test/nats-publish-message.rb
 - test/plugin/test_in_nats.rb
+- test/plugin/test_out_nats.rb
 - test/test_helper.rb
 homepage: https://github.com/achied/fluent-plugin-nats
 licenses:
@@ -132,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: nats plugin for fluentd, an event collector