fluent-plugin-zabbix 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 35423c2cf732ed7048b36bb6c4c5882fb2526110
-  data.tar.gz: 46dbb7031bfb41f3ea4d7a9acd87dcef14714f3b
+SHA256:
+  metadata.gz: 97c7b621772f409af613b565d2b734e55786b00618297de55a53ece1949caf9e
+  data.tar.gz: a1e9d865a2bade7536f5c4ba886706640616f3a794066a267bf75971d4da1b38
 SHA512:
-  metadata.gz: 33cfd15134ba66af5163ec247b4696708d89960b86fb3a5a67f9ec9dffb33c7db8eabba8b8c8f55542f22e0601452af684fd27e6d134ad640949f955dddaf29e
-  data.tar.gz: bab731439abad3a3a7242ff35840d29a305ab9d529aa83f7fe75ba4ee9b5ee5fc811368bebf0b5117478b81987f5d552b2c2c9bd6fe022588ec63588b040318f
+  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/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/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.3.0"
+  gem.version       = "0.3.1"
 
   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

@@ -70,7 +70,7 @@ class Fluent::Plugin::ZabbixOutput < Fluent::Plugin::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
         }
@@ -85,7 +85,7 @@ class Fluent::Plugin::ZabbixOutput < Fluent::Plugin::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
         }

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

@@ -4,7 +4,7 @@ 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
@@ -13,7 +13,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
@@ -32,24 +32,25 @@ class ZabbixOutputTest < Test::Unit::TestCase
 
   def test_write
     d = create_driver
+    now = Time.now.to_i
     if ENV['LIVE_TEST']
-      d.run(default_tag: 'test') do
-        d.feed({"foo" => "test value of foo"})
-        d.feed({"bar" => "test value of bar"})
-        d.feed({"baz" => 123.4567 })
-        d.feed({"foo" => "yyy", "zabbix_host" => "alternative-hostname"})
-        d.feed({"f1" => 0.000001})
-        d.feed({"f2" => 0.01})
+      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
@@ -79,32 +80,34 @@ END
 
   def test_write_host_key
     d = create_driver_host_key
+    now = Time.now.to_i
     if ENV['LIVE_TEST']
-      d.run(default_tag: 'test') do
-        d.feed({"foo" => "AAA" })
-        d.feed({"foo" => "BBB", "host" => "alternative-hostname"})
+      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.run(default_tag: 'test') do
-        d.feed({"foo" => "AAA"})
-        d.feed({"foo" => "BBB", "prefix" => "p"})
+      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.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -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,6 +107,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -115,8 +117,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:
@@ -137,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