fluent-plugin-zabbix 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43040b784e1f30ebcf9d3d563ee29b037ee0455
-  data.tar.gz: 9d147154a237892102d535fbf251f5220bb3c08f
+  metadata.gz: 95041f2ebddbc8198a121ca2aa73dde358737f83
+  data.tar.gz: 72c3d45c786d5137dc8ea8e8a051cb96ee581154
 SHA512:
-  metadata.gz: 7faea03b7cbb919c5311d9bb6e70f06435d1e6ce9e2ea502c0fa5728950a37223108b0028102e0fb1415cbf0a43ef1d596fa4659dd6abd4904926d5a2468007e
-  data.tar.gz: d94f298c331c50958ec855b1a2f6af11ae61a515d4cba78880d78a55ee1eaae14b06b71bd91e1d2889ab8b1aee49fcf28dff3cc159aea0ce6330981451a1757e
+  metadata.gz: da34f9201d9dfe8b7d32402d52c775a9ab05cbca7f3bc53b0586e6f7e71ae015bedbb852afe841db684995429355363ea320a4277024c95c46d0b1b9aade8dc4
+  data.tar.gz: efc107c61264121e42986406825fae7d33c3ea6f89a077c188ca2b6aef7af4648c90f1abce0efa491ec3c5d609f50805b36d580f4e505575d9f0e5246d22c5c9

data/README.rdoc

@@ -29,7 +29,7 @@ For messages such as:
       name_keys     metrics.field1,metrics.field2
     </match>
 
-or, use "add_keys_prefix"
+or, use "add_key_prefix"
     tag:metrics {"field1":300, "field2":20}
 
     <match metrics>

data/fluent-plugin-zabbix.gemspec

@@ -13,7 +13,7 @@ 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.3"
+  gem.version       = "0.0.4"
 
   gem.add_runtime_dependency "fluentd", "~> 0.10"
   gem.add_runtime_dependency "zabbix", ">= 0.4"

data/lib/fluent/plugin/out_zabbix.rb

@@ -57,8 +57,14 @@ class Fluent::ZabbixOutput < Fluent::Output
       zbx = Zabbix::Sender.new(:host => @zabbix_server, :port => @port)
       log.debug("zabbix: #{zbx}, #{name}: #{value}, host: #{host}, ts: #{time}")
       opts = { :host => host, :ts => time }
-      status = zbx.send_data(name, value.to_s, opts)
-
+      if value.kind_of? Float
+        # https://www.zabbix.com/documentation/2.4/manual/config/items/item
+        # > Allowed range (for MySQL): -999999999999.9999 to 999999999999.9999 (double(16,4)).
+        # > Starting with Zabbix 2.2, receiving values in scientific notation is also supported. E.g. 1e+70, 1e-70.
+        status = zbx.send_data(name, value.round(4).to_s, opts)
+      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}'"

data/test/mockserver.go

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"log"
+
+	"github.com/fujiwara/go-zabbix-get/zabbix"
+)
+
+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
+		},
+	)
+	if err != nil {
+		panic(err)
+	}
+}

data/test/plugin/test_out_zabbix.rb

@@ -9,7 +9,7 @@ class ZabbixOutputTest < Test::Unit::TestCase
     zabbix_server  127.0.0.1
     host           test_host
     add_key_prefix test
-    name_keys      foo, bar, baz
+    name_keys      foo, bar, baz, f1, f2
   ]
 
   def create_driver(conf = CONFIG, tag='test')
@@ -23,11 +23,12 @@ class ZabbixOutputTest < Test::Unit::TestCase
       d.emit({"bar" => "test value of bar"})
       d.emit({"baz" => rand * 10 })
       d.emit({"foo" => "yyy", "zabbix_host" => "alternative-hostname"})
+      d.emit({"f1" => 0.000001})
+      d.emit({"f2" => 0.01})
       d.run
     end
   end
 
-
   CONFIG_HOST_KEY = %[
     zabbix_server  127.0.0.1
     host           test_host

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -69,6 +69,7 @@ files:
 - fluent-plugin-zabbix.gemspec
 - lib/fluent/plugin/out_zabbix.rb
 - test/helper.rb
+- test/mockserver.go
 - test/plugin/test_out_zabbix.rb
 homepage: https://github.com/fujiwara/fluent-plugin-zabbix
 licenses: []
@@ -95,4 +96,5 @@ 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