fluent-plugin-zabbix 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1e840411e29db42fc60e77d0b56235e8012bb9e6
-  data.tar.gz: 1ed7a4df13454605e0c1a9dd00003353db7d5aac
+SHA256:
+  metadata.gz: 97c7b621772f409af613b565d2b734e55786b00618297de55a53ece1949caf9e
+  data.tar.gz: a1e9d865a2bade7536f5c4ba886706640616f3a794066a267bf75971d4da1b38
 SHA512:
-  metadata.gz: 27c58fc74df1d1d0ba806ec89586588eb63d236bf4c35edf638986f4e06aa8d305005e5845800206a090b9a53dc8a6d246f0b770b85fd92543931b3130f20bd8
-  data.tar.gz: 1a18cfb1ba839c90ec7908fe820f564ddfb75ec20fcfa5c517e16c855417a5b1e93e5b479e008bf8b3649ac079779521ea49556d61390ebd61870c6943e62777
+  metadata.gz: 36a71a4ea7e3b9f3188d976f301b7fbde974d5ccd7580a234332f7f8b0d93cb8848d52b5700cb7bb786539a869daedf617f5b1e4e8f18601cf814b8dea063cfd
+  data.tar.gz: 598ac514f14971ae29a3e7f3d548806dcf7af2649bf8b341fb944a5647b4ead579be81cefd997aaa53c2e706da14e3a9cab57076b3cec45f3684aeebdf3cfd87

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "20:00"
+  open-pull-requests-limit: 10

data/.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: test
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
+    name: test on Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle install
+      - run: |
+          bundle exec rake test
+        env:
+          LIVE_TEST: 1

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3
+  - 2.4.0
 gemfile:
   - Gemfile
 before_install:

data/README.md

@@ -67,6 +67,8 @@ v0.0.7~ includes [Fluent::Mixin::ConfigPlaceholders](https://github.com/tagomori
 </match>
 ```
 
+`host` parameter is set by default to Ruby's `Socket.gethostname` if not specified.
+
 # TODO
 
 - patches welcome!

data/Rakefile

@@ -9,4 +9,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/fluent-plugin-zabbix.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-zabbix"
   gem.require_paths = ["lib"]
-  gem.version       = "0.2.3"
+  gem.version       = "0.3.1"
 
-  gem.add_runtime_dependency "fluentd", [">= 0.10", "< 2"]
+  gem.add_runtime_dependency "fluentd", [">= 0.14.8", "< 2"]
   gem.add_runtime_dependency "yajl-ruby", "~> 1.0"
   gem.add_runtime_dependency "fluent-mixin-config-placeholders", "~> 0.3"
   gem.add_development_dependency "rake", ">= 0.9.2"
-  gem.add_development_dependency "glint", "= 0.0.2"
+  gem.add_development_dependency "glint", "= 0.1.0"
   gem.add_development_dependency "test-unit", ">= 3.1.0"
 end

data/lib/fluent/plugin/out_zabbix.rb

@@ -1,40 +1,28 @@
+require 'socket'
+require 'yajl'
+require 'fluent/plugin/output'
 require 'fluent/mixin/config_placeholders'
 
-class Fluent::ZabbixOutput < Fluent::Output
+class Fluent::Plugin::ZabbixOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('zabbix', self)
 
   ZBXD = "ZBXD\x01"
   ZBX_PROTO_VALUE_SENDER_DATA = 'sender data'
 
-  def initialize
-    super
-    require 'socket'
-    require 'yajl'
-  end
-
   config_param :zabbix_server, :string
-  config_param :port, :integer,            :default => 10051
-  config_param :host, :string,             :default => Socket.gethostname
-  config_param :host_key, :string,         :default => nil
-  config_param :name_keys, :string,        :default => nil
-  config_param :name_key_pattern, :string, :default => nil
-  config_param :add_key_prefix, :string,   :default => nil
-  config_param :prefix_key, :string,       :default => nil
+  config_param :port, :integer,            default: 10051
+  config_param :host, :string,             default: Socket.gethostname
+  config_param :host_key, :string,         default: nil
+  config_param :name_keys, :string,        default: nil
+  config_param :name_key_pattern, :string, default: nil
+  config_param :add_key_prefix, :string,   default: nil
+  config_param :prefix_key, :string,       default: nil
 
   include Fluent::Mixin::ConfigPlaceholders
 
-  # Define `log` method for v0.10.42 or earlier
-  unless method_defined?(:log)
-    define_method("log") { $log }
-  end
-
   def configure(conf)
     super
 
-    if @zabbix_server.nil?
-      raise Fluent::ConfigError, "missing zabbix_server"
-    end
-
     if @name_keys.nil? and @name_key_pattern.nil?
       raise Fluent::ConfigError, "missing both of name_keys and name_key_pattern"
     end
@@ -49,12 +37,8 @@ class Fluent::ZabbixOutput < Fluent::Output
     end
   end
 
-  def start
-    super
-  end
-
-  def shutdown
-    super
+  def multi_workers_ready?
+    true
   end
 
   def bulk_send(time, bulk)
@@ -76,17 +60,17 @@ class Fluent::ZabbixOutput < Fluent::Output
     end
   end
 
-  def emit(tag, es, chain)
+  def process(tag, es)
     if @name_keys
       es.each {|time,record|
         host = gen_host(record)
         bulk = []
         @name_keys.each {|key|
           if record[key]
-            bulk.push({ :key => format_key(tag, key, record),
-                        :value => format_value(record[key]),
-                        :host => host,
-                        :time => time.to_i,
+            bulk.push({ key: format_key(tag, key, record),
+                        value: format_value(record[key]),
+                        host: host,
+                        clock: time.to_i,
                       })
           end
         }
@@ -98,17 +82,16 @@ class Fluent::ZabbixOutput < Fluent::Output
         bulk = []
         record.keys.each {|key|
           if @name_key_pattern.match(key) && record[key]
-            bulk.push({ :key => format_key(tag, key, record),
-                        :value => format_value(record[key]),
-                        :host => host,
-                        :time => time.to_i,
+            bulk.push({ key: format_key(tag, key, record),
+                        value: format_value(record[key]),
+                        host: host,
+                        clock: time.to_i,
                       })
           end
         }
         bulk_send(time, bulk) if bulk.size > 0
       }
     end
-    chain.next
   end
 
   def gen_host(record)
@@ -155,9 +138,9 @@ class Fluent::ZabbixOutput < Fluent::Output
 
   def send_to_zabbix(sock, time, bulk)
     req = Yajl::Encoder.encode({
-      :request => ZBX_PROTO_VALUE_SENDER_DATA,
-      :clock => time.to_i,
-      :data => bulk,
+      request: ZBX_PROTO_VALUE_SENDER_DATA,
+      clock: time.to_i,
+      data: bulk,
     })
     sock.write(ZBXD + [ req.size ].pack('q') + req)
     sock.flush

data/mockserver/go.mod

@@ -0,0 +1,5 @@
+module github.com/fujiwara/fluent-plugin-zabbix/mockserver
+
+go 1.18
+
+require github.com/fujiwara/go-zabbix-get v0.1.0

data/mockserver/go.sum

@@ -0,0 +1,2 @@
+github.com/fujiwara/go-zabbix-get v0.1.0 h1:Aufw3MvWksIc9wCTbHipikkBFX8PD220IrnE9LC7eO8=
+github.com/fujiwara/go-zabbix-get v0.1.0/go.mod h1:1C6hUoBE4tOGZFGqHhhIj3NBfU8BJ+/YDDRGjLQhSdA=

data/{test → mockserver}/mockserver.go

@@ -31,10 +31,11 @@ func main() {
 func handler(req zabbix.TrapperRequest) (res zabbix.TrapperResponse, err error) {
 	for _, d := range req.Data {
 		line := fmt.Sprintf(
-			"host:%s\tkey:%s\tvalue:%s\n",
+			"host:%s\tkey:%s\tvalue:%s\tclock:%d\n",
 			d.Host,
 			d.Key,
 			d.Value,
+			d.Clock,
 		)
 		Output.Write([]byte(line))
 	}

data/test/plugin/test_out_zabbix.rb

@@ -1,9 +1,10 @@
 require 'helper'
+require 'fluent/test/driver/output'
 
 if ENV['LIVE_TEST']
   require "glint"
   require "tmpdir"
-  system "go", "build", "test/mockserver.go"
+  system "sh -c 'cd mockserver && go build mockserver.go'"
 end
 
 class ZabbixOutputTest < Test::Unit::TestCase
@@ -11,8 +12,8 @@ class ZabbixOutputTest < Test::Unit::TestCase
     Fluent::Test.setup
     if ENV['LIVE_TEST']
       $dir = Dir.mktmpdir
-      $server = Glint::Server.new(10051, { :timeout => 3 }) do |port|
-        exec "./mockserver", $dir.to_s + "/trapper.log"
+      $server = Glint::Server.new(10051, { timeout: 3 }) do |port|
+        exec "./mockserver/mockserver", $dir.to_s + "/trapper.log"
       end
       $server.start
     end
@@ -25,29 +26,31 @@ class ZabbixOutputTest < Test::Unit::TestCase
     name_keys      foo, bar, baz, f1, f2
   ]
 
-  def create_driver(conf = CONFIG, tag='test')
-    Fluent::Test::OutputTestDriver.new(Fluent::ZabbixOutput, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::ZabbixOutput).configure(conf)
   end
 
   def test_write
     d = create_driver
+    now = Time.now.to_i
     if ENV['LIVE_TEST']
-      d.emit({"foo" => "test value of foo"})
-      d.emit({"bar" => "test value of bar"})
-      d.emit({"baz" => 123.4567 })
-      d.emit({"foo" => "yyy", "zabbix_host" => "alternative-hostname"})
-      d.emit({"f1" => 0.000001})
-      d.emit({"f2" => 0.01})
-      d.run
-      sleep 1
+      d.run() do
+        d.feed('test', now, {"foo" => "test value of foo"})
+        d.feed('test', now, {"bar" => "test value of bar"})
+        d.feed('test', now, {"baz" => 123.4567 })
+        d.feed('test', now, {"foo" => "yyy", "zabbix_host" => "alternative-hostname"})
+        d.feed('test', now, {"f1" => 0.000001})
+        d.feed('test', now, {"f2" => 0.01})
+        sleep 1
+      end
       $server.stop
       assert_equal open($dir + "/trapper.log").read, <<END
-host:test_host	key:test.foo	value:test value of foo
-host:test_host	key:test.bar	value:test value of bar
-host:test_host	key:test.baz	value:123.4567
-host:test_host	key:test.foo	value:yyy
-host:test_host	key:test.f1	value:0.0
-host:test_host	key:test.f2	value:0.01
+host:test_host	key:test.foo	value:test value of foo	clock:#{now}
+host:test_host	key:test.bar	value:test value of bar	clock:#{now}
+host:test_host	key:test.baz	value:123.4567	clock:#{now}
+host:test_host	key:test.foo	value:yyy	clock:#{now}
+host:test_host	key:test.f1	value:0.0	clock:#{now}
+host:test_host	key:test.f2	value:0.01	clock:#{now}
 END
     end
   end
@@ -60,8 +63,8 @@ END
     name_keys      foo, bar, baz
   ]
 
-  def create_driver_host_key(conf = CONFIG_HOST_KEY, tag='test')
-    Fluent::Test::OutputTestDriver.new(Fluent::ZabbixOutput, tag).configure(conf)
+  def create_driver_host_key(conf = CONFIG_HOST_KEY)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::ZabbixOutput).configure(conf)
   end
 
   CONFIG_PREFIX_KEY = %[
@@ -71,36 +74,40 @@ END
     name_keys      foo, bar, baz
   ]
 
-  def create_driver_prefix_key(conf = CONFIG_PREFIX_KEY, tag='test')
-    Fluent::Test::OutputTestDriver.new(Fluent::ZabbixOutput, tag).configure(conf)
+  def create_driver_prefix_key(conf = CONFIG_PREFIX_KEY)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::ZabbixOutput).configure(conf)
   end
 
   def test_write_host_key
     d = create_driver_host_key
+    now = Time.now.to_i
     if ENV['LIVE_TEST']
-      d.emit({"foo" => "AAA" })
-      d.emit({"foo" => "BBB", "host" => "alternative-hostname"})
-      d.run
-      sleep 1
+      d.run() do
+        d.feed('test', now, {"foo" => "AAA" })
+        d.feed('test', now, {"foo" => "BBB", "host" => "alternative-hostname"})
+        sleep 1
+      end
       $server.stop
       assert_equal open($dir + "/trapper.log").read, <<END
-host:test_host	key:test.foo	value:AAA
-host:alternative-hostname	key:test.foo	value:BBB
+host:test_host	key:test.foo	value:AAA	clock:#{now}
+host:alternative-hostname	key:test.foo	value:BBB	clock:#{now}
 END
     end
   end
 
   def test_write_prefix_key
     d = create_driver_prefix_key
+    now = Time.now.to_i
     if ENV['LIVE_TEST']
-      d.emit({"foo" => "AAA"})
-      d.emit({"foo" => "BBB", "prefix" => "p"})
-      d.run
-      sleep 1
+      d.run() do
+        d.feed('test', now, {"foo" => "AAA"})
+        d.feed('test', now, {"foo" => "BBB", "prefix" => "p"})
+        sleep 1
+      end
       $server.stop
       assert_equal open($dir + "/trapper.log").read, <<END
-host:test_host	key:foo	value:AAA
-host:test_host	key:p.foo	value:BBB
+host:test_host	key:foo	value:AAA	clock:#{now}
+host:test_host	key:p.foo	value:BBB	clock:#{now}
 END
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -107,17 +107,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.fluentd.lt.0.10.43
 - LICENSE
 - README.md
 - Rakefile
 - fluent-plugin-zabbix.gemspec
 - lib/fluent/plugin/out_zabbix.rb
+- mockserver/go.mod
+- mockserver/go.sum
+- mockserver/mockserver.go
 - test/helper.rb
-- test/mockserver.go
 - test/plugin/test_out_zabbix.rb
 homepage: https://github.com/fujiwara/fluent-plugin-zabbix
 licenses:
@@ -138,12 +141,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Output data plugin to Zabbix (like zabbix_sender)
 test_files:
 - test/helper.rb
-- test/mockserver.go
 - test/plugin/test_out_zabbix.rb

data/Gemfile.fluentd.lt.0.10.43

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in fluent-plugin-zabbix.gemspec
-gem 'fluentd', '= 0.10.42'
-gemspec