fluent-plugin-zabbix 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f9584189d91c7cb8240c598a1d263153773dd5b1
-  data.tar.gz: 37c9b2900af32681fa7ec8a2bda11627028c1b59
+SHA256:
+  metadata.gz: 497e57af1beaf3860ad81af6bc382b98c0cd214df32e41135619f157a263a1f0
+  data.tar.gz: 2c7936b561ea53f172898bffe21223846659d7ec5b58c5b4cb1db1a7feb3692c
 SHA512:
-  metadata.gz: 9bbea55a979895b1d3a42407a7fe7c0a833ad48128c17a7cb941f68b4fdd83f172c5cd9aa8e13fb58feba8a59f60d4857a2c1989c133382b6994c6ae28662329
-  data.tar.gz: c0e6b45f5e9b816aca5a56094fffd5c986e5c1995149a6285c4b3d9ad60cb396207d73d5c98de41252b2a54c4f6b2436ac44219f1937f7c076ca5564b96c2d6b
+  metadata.gz: a57dabda7d0bd4d72e581eccd029edfd8d54421df0efb8f934a40dc98df2fbe7a83f98527d65c2a9c6b3a5cbffe351dbbca1390d941b5c06dbb56a64184c678c
+  data.tar.gz: aef02a1016229ec9b75503bd7e0fcebb4c356496e78f6850deec5e1fe1c774c1aedc2267b0b2676231bb6e23de8a6144a12770e9a09cde9db21b97f2bb4c6ed2

data/fluent-plugin-zabbix.gemspec

@@ -14,12 +14,13 @@ 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.2"
+  gem.version       = "0.2.4"
 
-  gem.add_runtime_dependency "fluentd", [">= 0.10", "< 2"]
+  gem.add_runtime_dependency "fluentd", [">= 0.10", "< 0.14"]
   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"
+  gem.add_development_dependency "webrick"
 end

data/lib/fluent/plugin/out_zabbix.rb

@@ -4,6 +4,7 @@ class Fluent::ZabbixOutput < Fluent::Output
   Fluent::Plugin.register_output('zabbix', self)
 
   ZBXD = "ZBXD\x01"
+  ZBX_PROTO_VALUE_SENDER_DATA = 'sender data'
 
   def initialize
     super
@@ -85,7 +86,7 @@ class Fluent::ZabbixOutput < Fluent::Output
             bulk.push({ :key => format_key(tag, key, record),
                         :value => format_value(record[key]),
                         :host => host,
-                        :time => time.to_i,
+                        :clock => time.to_i,
                       })
           end
         }
@@ -100,7 +101,7 @@ class Fluent::ZabbixOutput < Fluent::Output
             bulk.push({ :key => format_key(tag, key, record),
                         :value => format_value(record[key]),
                         :host => host,
-                        :time => time.to_i,
+                        :clock => time.to_i,
                       })
           end
         }
@@ -154,7 +155,7 @@ class Fluent::ZabbixOutput < Fluent::Output
 
   def send_to_zabbix(sock, time, bulk)
     req = Yajl::Encoder.encode({
-      :request => 'agent data',
+      :request => ZBX_PROTO_VALUE_SENDER_DATA,
       :clock => time.to_i,
       :data => bulk,
     })

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

@@ -3,7 +3,7 @@ require 'helper'
 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
@@ -12,7 +12,7 @@ class ZabbixOutputTest < Test::Unit::TestCase
     if ENV['LIVE_TEST']
       $dir = Dir.mktmpdir
       $server = Glint::Server.new(10051, { :timeout => 3 }) do |port|
-        exec "./mockserver", $dir.to_s + "/trapper.log"
+        exec "./mockserver/mockserver", $dir.to_s + "/trapper.log"
       end
       $server.start
     end
@@ -31,23 +31,24 @@ class ZabbixOutputTest < Test::Unit::TestCase
 
   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
+      d.emit({"foo" => "test value of foo"}, now)
+      d.emit({"bar" => "test value of bar"}, now)
+      d.emit({"baz" => 123.4567 }, now)
+      d.emit({"foo" => "yyy", "zabbix_host" => "alternative-hostname"}, now)
+      d.emit({"f1" => 0.000001}, now)
+      d.emit({"f2" => 0.01}, now)
       sleep 1
+
       $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
@@ -77,30 +78,33 @@ 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.emit({"foo" => "AAA" }, now)
+      d.emit({"foo" => "BBB", "host" => "alternative-hostname"}, now)
       d.run
       sleep 1
+
       $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.emit({"foo" => "AAA"}, now)
+      d.emit({"foo" => "BBB", "prefix" => "p"}, now)
       d.run
       sleep 1
       $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.2
+  version: 0.2.4
 platform: ruby
 authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -19,7 +19,7 @@ dependencies:
         version: '0.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -100,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Output data plugin to Zabbix
 email:
 - fujiwara.shunichiro@gmail.com
@@ -116,8 +130,10 @@ files:
 - 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 +154,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
+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