fluent-plugin-osquery 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d0eee74f674f51a61e811a4a4dfc9f3ed05226b8b41d0807abae73d5bb9c8413
-  data.tar.gz: 51f5a3ea8a323afc2ce53835e5fe2a9393371cc50a44c71145b55f20467a0fa1
+SHA1:
+  metadata.gz: 5555cc0776a704e38f7cefb6d41b40a68200795f
+  data.tar.gz: 6a95bf4f9a44193ff5bf7623845b5661acce29e7
 SHA512:
-  metadata.gz: 8a7baf95ffc9dfb8ecabb0da1fae0e7b4a02c1a80e341887b766692b05b7b62c33784ad1f7fd5fbde85f759c1057483cc98013ef88b78646325551ada3f72420
-  data.tar.gz: 8eb2e871b33cbcf426f76cc0e64729cff91f7a25a00e90e83ea20f438b2ea9e120320a3f24e9ea7f1960efeb6f22f1b4a1ec6e7d5fe24cfb0914430bbd1db258
+  metadata.gz: 7e5e3193482dbfdd519fbb99e128085ee230e24f6986a090c6ccfda02975234263c348ec035b00342be931a2b29f89d7bba6228b6097cbb09742bd364a77f18b
+  data.tar.gz: 1f45c004c7f86043990cc631fa1d09706884effed8e0964228d041fa283ad55c19c08a32d0054fd4d2178257c33db03a7b3a1b8fa9427c53f331824d7d0d8bb9

data/fluent-plugin-osquery.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-osquery'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['Hidenori Suzuki']
   spec.email         = ['hidenori.suzuki@yahoo.com']
   spec.summary       = 'a fluent plugin'
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'fluentd', '~> 1.2.6'
+  spec.add_runtime_dependency 'fluentd', '~> 1.2.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/fluent/plugin/in_osquery.rb

@@ -1,8 +1,13 @@
 # coding: utf-8
-require 'fluent/input'
-module Fluent
-  class OsqueryInput < Fluent::Input
+require 'json'
+require 'fluent/plugin/input'
+
+module Fluent::Plugin
+  class OsqueryInput < Fluent::Plugin::Input
     Fluent::Plugin.register_input('osquery', self)
+
+    helpers :timer
+
     config_param :tag, :string, default: 'osquery'
     config_param :interval, :integer, default: 60
     config_param :query, :string, default: 'select * from processes'
@@ -13,7 +18,6 @@ module Fluent
 
     def initialize
       super
-      require 'json'
     end
 
     def configure(conf)
@@ -21,55 +25,29 @@ module Fluent
     end
 
     def start
-      @loop = Coolio::Loop.new
-      @tw = TimerWatcher.new(interval, true, log, &method(:execute))
-      @tw.attach(@loop)
-      @thread = Thread.new(&method(:run))
+      super
+      timer_execute(:in_osquery_timer, interval, &method(:execute))
     end
 
     def shutdown
-      @tw.detach
-      @loop.stop
-      @thread.join
-    end
-
-    def run
-      @loop.run
-    rescue => e
-      @log.error 'unexpected error', error: e.to_s
-      @log.error_backtrace
+      super
     end
 
     private
 
     def execute
-      @time = Engine.now
+      @time = Fluent::Engine.now
       cmd = "osqueryi --json \"#{@query}\""
-      @log.debug(cmd)
+      log.debug(cmd)
       record = `#{cmd}`
       jsonrec = JSON.parse(record)
       jsonrec.each do |line|
-        @log.debug(line)
+        log.debug(line)
         router.emit(@tag, @time, line)
       end
     rescue => e
-      @log.error('faild to run', error: e.to_s, error_class: e.class.to_s)
-      @log.error_backtrace
-    end
-
-    class TimerWatcher < Coolio::TimerWatcher
-      def initialize(interval, repeat, log, &callback)
-        @log = log
-        @callback = callback
-        super(interval, repeat)
-      end
-
-      def on_timer
-        @callback.call
-      rescue => e
-        @log.error e.to_s
-        @log.error_backtrace
-      end
+      log.error('faild to run', error: e.to_s, error_class: e.class.to_s)
+      log.error_backtrace
     end
   end
 end

data/spec/fluent/plugin/in_osquery_spec.rb

@@ -8,14 +8,14 @@ CONFIG = BASE_CONFIG + %(
   interval 1
 )
 
-describe Fluent::OsqueryInput do
+describe Fluent::Plugin::OsqueryInput do
   before do
     Fluent::Test.setup
   end
 
   describe '#configure' do
     let(:d) do
-      Fluent::Test::InputTestDriver.new(Fluent::OsqueryInput)
+      Fluent::Test::Driver::Input.new(Fluent::Plugin::OsqueryInput)
     end
 
     context 'test of test' do
@@ -29,7 +29,7 @@ describe Fluent::OsqueryInput do
 
   describe '#run' do
     let(:d) do
-      Fluent::Test::InputTestDriver.new(Fluent::OsqueryInput)
+      Fluent::Test::Driver::Input.new(Fluent::Plugin::OsqueryInput)
         .configure(config)
     end
 

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 require 'fluent/test'
+require 'fluent/test/driver/input'
 require 'fluent/plugin/in_osquery'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-osquery
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Hidenori Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-06 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: a fluent plugin