fluent-plugin-zabbix 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 778dffb330bf90f5e65b9bab2b57ca3fb29bbee6
-  data.tar.gz: 26d030c79c0680a76a387e0edb61e2ddd9ecf5d5
+  metadata.gz: 75f72ffcfce03e77cff9b5181a4ebacc94d7db7b
+  data.tar.gz: 048a1130e81d421c05de2a97b81cfeeacfdef764
 SHA512:
-  metadata.gz: bb3f14d22487dc1b29002b447da2459ec2905e4ab46ab98a2ae779bae45fe4544444b0f2619dbca70f9a40a81bebd03ea1c08903546f41e62368761cdd2fd860
-  data.tar.gz: a198b9002377c9adb801dab673193c12f2a29964e3d3bf04bcb9eeed40cb7e5de86d3100748b8bd9ee31a55b47d28414185695271f51efc009675b29dad1e578
+  metadata.gz: 2e6ae91ae3b89670755efc4fb6393262f92b69fc102e82b012546f41eac873f638fd8e0a24feef5f5dc6218a7ec0d959b3230fe42cba34d4ead309905694e83d
+  data.tar.gz: bb5192c9d7e75aaacacba47880c1cb87d869c88ccb622a0ef73cb83e75d768eaa0606ecc5bbb911bd62858e8c7675a739a77f4bb100bbf85b6cfb7b11cd7066f

data/.travis.yml

@@ -2,7 +2,12 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1
+  - 2.2
 gemfile:
   - Gemfile
   - Gemfile.fluentd.lt.0.10.43
+matrix:
+  exclude:
+    - rvm: 2.2
+    - gemfile: Gemfile.fluentd.lt.0.10.43

data/fluent-plugin-zabbix.gemspec

@@ -13,11 +13,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.0.7"
+  gem.version       = "0.1.0"
 
   gem.add_runtime_dependency "fluentd", "~> 0.10"
   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 "test-unit", ">= 3.1.0"
 end

data/lib/fluent/plugin/out_zabbix.rb

@@ -55,25 +55,13 @@ class Fluent::ZabbixOutput < Fluent::Output
     super
   end
 
-  def send(host, tag, name, value, time)
-    if @add_key_prefix
-      if @add_key_prefix == '${tag}'
-        name = "#{tag}.#{name}"
-      else
-        name = "#{@add_key_prefix}.#{name}"
-      end
+  def send(time, bulk)
+    bulk.each do |d|
     end
     begin
       sock = TCPSocket.open(@zabbix_server, @port)
-      log.debug("zabbix: #{sock} #{name}: #{value}, host: #{host}, ts: #{time}")
-      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 = send_to_zabbix(sock, host, name, value.round(4).to_s, time)
-      else
-        status = send_to_zabbix(sock, host, name, value.to_s, time)
-      end
+      log.debug("zabbix: #{sock} #{bulk}, ts: #{time}")
+      status = send_to_zabbix(sock, time, bulk)
     rescue => e
       log.warn "plugin-zabbix: raises exception: #{e}"
       status = false
@@ -82,7 +70,7 @@ class Fluent::ZabbixOutput < Fluent::Output
     end
 
     unless status
-      log.warn "plugin-zabbix: failed to send to zabbix_server: #{@zabbix_server}:#{@port}, host:#{host} '#{name}': #{value}"
+      log.warn "plugin-zabbix: failed to send to zabbix_server: #{@zabbix_server}:#{@port} #{bulk}"
     end
   end
 
@@ -90,20 +78,32 @@ class Fluent::ZabbixOutput < Fluent::Output
     if @name_keys
       es.each {|time,record|
         host = gen_host(record)
-        @name_keys.each {|name|
-          if record[name]
-            send(host, tag, name, record[name], time)
+        bulk = []
+        @name_keys.each {|key|
+          if record[key]
+            bulk.push({ :key => format_key(tag, key),
+                        :value => format_value(record[key]),
+                        :host => host,
+                        :time => time.to_i,
+                      })
           end
         }
+        send(time, bulk) if bulk.size > 0
       }
     else # for name_key_pattern
       es.each {|time,record|
         host = gen_host(record)
+        bulk = []
         record.keys.each {|key|
-          if @name_key_pattern.match(key) and record[key]
-            send(host, tag, key, record[key], time)
+          if @name_key_pattern.match(key) && record[key]
+            bulk.push({ :key => format_key(tag, key),
+                        :value => format_value(record[key]),
+                        :host => host,
+                        :time => time.to_i,
+                      })
           end
         }
+        send(time, bulk) if bulk.size > 0
       }
     end
     chain.next
@@ -123,17 +123,34 @@ class Fluent::ZabbixOutput < Fluent::Output
     return host
   end
 
-  def send_to_zabbix(sock, host, key, value, time)
-    data = {
-      :host => host,
-      :key => key,
-      :value => value.to_s,
-      :time => time.to_i,
-    }
+  def format_key(tag, key)
+    if @add_key_prefix
+      if @add_key_prefix == '${tag}'
+        "#{tag}.#{key}"
+      else
+        "#{@add_key_prefix}.#{key}"
+      end
+    else
+      key
+    end
+  end
+
+  def format_value(value)
+    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.
+      value.round(4).to_s
+    else
+      value.to_s
+    end
+  end
+
+  def send_to_zabbix(sock, time, bulk)
     req = Yajl::Encoder.encode({
       :request => 'agent data',
       :clock => time.to_i,
-      :data => [ data ],
+      :data => bulk,
     })
     sock.write(ZBXD + [ req.size ].pack('q') + req)
     sock.flush

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: Output data plugin to Zabbix
 email:
 - fujiwara.shunichiro@gmail.com
@@ -118,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Output data plugin to Zabbix (like zabbix_sender)