fluent-plugin-zabbix 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95041f2ebddbc8198a121ca2aa73dde358737f83
-  data.tar.gz: 72c3d45c786d5137dc8ea8e8a051cb96ee581154
+  metadata.gz: 3549d1035d720adf10906025533a6b300b78cb91
+  data.tar.gz: 4217a75b549c6b3d104872c6fa81d6132028f321
 SHA512:
-  metadata.gz: da34f9201d9dfe8b7d32402d52c775a9ab05cbca7f3bc53b0586e6f7e71ae015bedbb852afe841db684995429355363ea320a4277024c95c46d0b1b9aade8dc4
-  data.tar.gz: efc107c61264121e42986406825fae7d33c3ea6f89a077c188ca2b6aef7af4648c90f1abce0efa491ec3c5d609f50805b36d580f4e505575d9f0e5246d22c5c9
+  metadata.gz: 2b8ca5659fa7e75dbdc0ce85ce24f53fe09578a0fe5491aa3795040c520f06f5c25665df6dbab0006aa3c17c758378988eda89813a77aed789ce5e46daedd296
+  data.tar.gz: 9f69b428aafca5e82a7e2baaa0711228fbc3a4aab0d23e152d5378634ec0ef77512672c476d8ae2f926edf8acc6bbc2061b6e3040d4ad927bc1dace47bdb6066

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 *~
 .#*
+mockserver

data/fluent-plugin-zabbix.gemspec

@@ -13,9 +13,10 @@ 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.0.4"
+  gem.version       = "0.0.5"
 
   gem.add_runtime_dependency "fluentd", "~> 0.10"
   gem.add_runtime_dependency "zabbix", ">= 0.4"
   gem.add_development_dependency "rake", ">= 0.9.2"
+  gem.add_development_dependency "glint", "= 0.0.2"
 end

data/lib/fluent/plugin/out_zabbix.rb

@@ -65,9 +65,8 @@ class Fluent::ZabbixOutput < Fluent::Output
       else
         status = zbx.send_data(name, value.to_s, opts)
       end
-    rescue IOError, EOFError, SystemCallError
-      # server didn't respond
-      log.warn "plugin-zabbix: Zabbix::Sender.send_data raises exception: #{$!.class}, '#{$!.message}'"
+    rescue => e
+      log.warn "plugin-zabbix: Zabbix::Sender.send_data raises exception: #{e}"
       status = false
     end
     unless status

data/test/mockserver.go

@@ -1,21 +1,43 @@
 package main
 
 import (
+	"fmt"
+	"io"
 	"log"
+	"os"
 
 	"github.com/fujiwara/go-zabbix-get/zabbix"
 )
 
+var Output io.Writer
+
 func main() {
-	err := zabbix.RunTrapperServer(
-		"127.0.0.1:10051",
-		func(req zabbix.TrapperRequest) (res zabbix.TrapperResponse, err error) {
-			log.Printf("%#v", req)
-			res.Proceeded = len(req.Data)
-			return res, nil
-		},
-	)
+	var err error
+	if len(os.Args) >= 2 {
+		Output, err = os.Create(os.Args[1])
+		if err != nil {
+			panic(err)
+		}
+		log.Printf("output to %s", os.Args[1])
+	} else {
+		Output = os.Stdout
+	}
+	err = zabbix.RunTrapper("127.0.0.1:10051", handler)
 	if err != nil {
 		panic(err)
 	}
 }
+
+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",
+			d.Host,
+			d.Key,
+			d.Value,
+		)
+		Output.Write([]byte(line))
+	}
+	res.Proceeded = len(req.Data)
+	return
+}

data/test/plugin/test_out_zabbix.rb

@@ -1,8 +1,21 @@
 require 'helper'
 
+if ENV['LIVE_TEST']
+  require "glint"
+  require "tmpdir"
+  system "go", "build", "test/mockserver.go"
+end
+
 class ZabbixOutputTest < Test::Unit::TestCase
   def setup
     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"
+      end
+      $server.start
+    end
   end
 
   CONFIG = %[
@@ -21,11 +34,21 @@ class ZabbixOutputTest < Test::Unit::TestCase
     if ENV['LIVE_TEST']
       d.emit({"foo" => "test value of foo"})
       d.emit({"bar" => "test value of bar"})
-      d.emit({"baz" => rand * 10 })
+      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
+      $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
+END
     end
   end
 
@@ -47,6 +70,12 @@ class ZabbixOutputTest < Test::Unit::TestCase
       d.emit({"foo" => "AAA" })
       d.emit({"foo" => "BBB", "host" => "alternative-hostname"})
       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
+END
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: glint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: Output data plugin to Zabbix
 email:
 - fujiwara.shunichiro@gmail.com