fluent-plugin-beats 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 72afa5e6cca09f6ce60b88900da46ab6a0305566
-  data.tar.gz: 4ad91fdea80506cdca867c6f1190f7fe035ba319
+SHA256:
+  metadata.gz: '092ac019d242807f0de4fb50f8f79947057b2084de286c1e57bfd38d5e9149c0'
+  data.tar.gz: ff608d2612acf8e3d0f23c6d8aa798d0ae301e94b3394faa630075d9841a90b4
 SHA512:
-  metadata.gz: 34a3410cdc560184eaa6f4145d5248ba86409e0b0db1a09cbe14ac982489f480166f7089c093379b1dba0780f70de25bec1ad69a7fca6b0e2992d7d537a5030e
-  data.tar.gz: a5291d9762879ab8d3364a318ca79df28f2e9ea0c5d82e781e151b78868fe460c23fc7de02de336175ecae03f75e009a20411ba2cbe6e5fa74cbc70dc235ce5b
+  metadata.gz: dc87c07cdcf60433a5b11fed9259b63e215045514f6c23e3e57a10cd49be1d36d9abb6749149bea1a739fc3d25724d51675c7ae72d13a8f813d9d5ce0f2528a2
+  data.tar.gz: f53064e29c5ddb2663b1ee0f64d8c1641fbf0c83670b6e5485bc5312b48c48d55c57eeb49b5fc731ed862755fc6494295c447a22774030a991b25f09085b7984

data/.travis.yml

@@ -0,0 +1,13 @@
+sudo: false
+language: ruby
+
+rvm:
+  - 2.1.9
+  - 2.2.5
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+
+script: bundle exec rake test
+gemfile:
+  - Gemfile

data/Rakefile

@@ -6,8 +6,9 @@ require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.test_files = FileList['test/test_*.rb']
-  test.verbose = true
+  test.test_files = FileList['test/plugin/test_*.rb']
+  test.verbose = false
+  test.warning = false
 end
 
 task :default => [:build]

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/fluent-plugin-beats.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]
-  gem.add_dependency "concurrent-ruby", "~> 0.9.2"
+  gem.add_dependency "concurrent-ruby", [">= 0.9.2", "< 2"]
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "test-unit", ">= 3.0.8"
   gem.add_development_dependency "test-unit-rr", ">= 1.0.3"

data/test/helper.rb

@@ -0,0 +1,8 @@
+require 'socket'
+
+def find_available_port
+  s = TCPServer.open(0)
+  port = s.addr[1]
+  s.close
+  return port
+end

data/test/plugin/test_in_beats.rb

@@ -0,0 +1,87 @@
+require 'fluent/test'
+require 'fluent/plugin/in_beats'
+require 'lumberjack/beats/client'
+require 'helper'
+
+class BeatsInputTest < Test::Unit::TestCase
+
+  def setup
+    Fluent::Test.setup
+  end
+
+  PORT = find_available_port
+
+  CONFIG = %[
+    port #{PORT}
+    bind 127.0.0.1
+    tag test.beats
+  ]
+
+  def create_driver(conf=CONFIG)
+    Fluent::Test::InputTestDriver.new(Fluent::BeatsInput).configure(conf)
+  end
+
+  def create_client
+    Lumberjack::Beats::Client.new({
+        :port => PORT,
+        :addresses => ['127.0.0.1'],
+        :json => true,
+        :ssl => false
+    })
+  end
+
+  def test_configure
+    d = create_driver
+    assert_equal PORT, d.instance.port
+    assert_equal '127.0.0.1', d.instance.bind
+    assert_equal 'test.beats', d.instance.tag
+  end
+
+  def test_send_beat
+    d = create_driver
+
+    timestamp = '2018-01-01T12:30:00.000Z'
+    payload = {
+        '@metadata' => {'beat' => 'heartbeat'},
+        '@timestamp' => timestamp,
+        'foo' => 'bar'
+    }
+
+    d.run do
+      client = create_client
+      client.write(payload)
+    end
+
+    tag, es = d.emit_streams[0]
+    assert_equal tag, 'test.beats'
+    assert_equal es.length, 1
+
+    time, record = es[0]
+    assert_equal time.to_i, Time.parse(timestamp).to_i
+    assert_equal record, payload
+  end
+
+  def test_metadata_as_tag
+    d = create_driver(CONFIG + 'metadata_as_tag')
+
+    timestamp = '2018-01-01T12:30:00.000Z'
+    payload = {
+        '@metadata' => {'beat' => 'heartbeat'},
+        '@timestamp' => timestamp,
+        'foo' => 'bar'
+    }
+
+    d.run do
+      client = create_client
+      client.write(payload)
+    end
+
+    tag, es = d.emit_streams[0]
+    assert_equal tag, 'heartbeat'
+    assert_equal es.length, 1
+
+    time, record = es[0]
+    assert_equal time.to_i, Time.parse(timestamp).to_i
+    assert_equal record, payload
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-beats
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -34,16 +34,22 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +99,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -103,6 +110,8 @@ files:
 - lib/lumberjack/beats.rb
 - lib/lumberjack/beats/client.rb
 - lib/lumberjack/beats/server.rb
+- test/helper.rb
+- test/plugin/test_in_beats.rb
 homepage: https://github.com/repeatedly/fluent-plugin-beats
 licenses:
 - Apache-2.0
@@ -123,8 +132,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Elastic beats plugin for Fluentd event collector
-test_files: []
+test_files:
+- test/helper.rb
+- test/plugin/test_in_beats.rb