fluent-plugin-zabbix 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3549d1035d720adf10906025533a6b300b78cb91
-  data.tar.gz: 4217a75b549c6b3d104872c6fa81d6132028f321
+  metadata.gz: e11da95c4e09044e40845f2292db90a2d1ca7ea8
+  data.tar.gz: 54def51b590808ba75f6e6ad65532f83b2c36f3c
 SHA512:
-  metadata.gz: 2b8ca5659fa7e75dbdc0ce85ce24f53fe09578a0fe5491aa3795040c520f06f5c25665df6dbab0006aa3c17c758378988eda89813a77aed789ce5e46daedd296
-  data.tar.gz: 9f69b428aafca5e82a7e2baaa0711228fbc3a4aab0d23e152d5378634ec0ef77512672c476d8ae2f926edf8acc6bbc2061b6e3040d4ad927bc1dace47bdb6066
+  metadata.gz: 38e28be96f3102f1598705e0151c408ff6d90f4613b3a0364eaf45f3e140d15f001bae1b0dbb362c335a0a07a8405ca4e7a17697302c12f3a34e4b0263200c50
+  data.tar.gz: abdbcc01fc4a6a6a2771e9a61744ceb55bf29aad25f881c821df2f60795cf7567bcf6da247f34ec6316f473f31c242f5499f569ba165b7d4d8720d892a79bb26

data/fluent-plugin-zabbix.gemspec

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

data/lib/fluent/plugin/out_zabbix.rb

@@ -1,10 +1,12 @@
 class Fluent::ZabbixOutput < Fluent::Output
   Fluent::Plugin.register_output('zabbix', self)
 
+  ZBXD = "ZBXD\x01"
+
   def initialize
     super
-    require 'zabbix'
     require 'socket'
+    require 'yajl'
   end
 
   config_param :zabbix_server, :string
@@ -54,21 +56,23 @@ class Fluent::ZabbixOutput < Fluent::Output
       name = "#{@add_key_prefix}.#{name}"
     end
     begin
-      zbx = Zabbix::Sender.new(:host => @zabbix_server, :port => @port)
-      log.debug("zabbix: #{zbx}, #{name}: #{value}, host: #{host}, ts: #{time}")
-      opts = { :host => host, :ts => time }
+      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 = zbx.send_data(name, value.round(4).to_s, opts)
+        status = send_to_zabbix(sock, host, name, value.round(4).to_s, time)
       else
-        status = zbx.send_data(name, value.to_s, opts)
+        status = send_to_zabbix(sock, host, name, value.to_s, time)
       end
     rescue => e
-      log.warn "plugin-zabbix: Zabbix::Sender.send_data raises exception: #{e}"
+      log.warn "plugin-zabbix: raises exception: #{e}"
       status = false
+    ensure
+      sock.close if sock
     end
+
     unless status
       log.warn "plugin-zabbix: failed to send to zabbix_server: #{@zabbix_server}:#{@port}, host:#{host} '#{name}': #{value}"
     end
@@ -110,4 +114,29 @@ class Fluent::ZabbixOutput < Fluent::Output
     end
     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,
+    }
+    req = Yajl::Encoder.encode({
+      :request => 'agent data',
+      :clock => time.to_i,
+      :data => [ data ],
+    })
+    sock.write(ZBXD + [ req.size ].pack('q') + req)
+    sock.flush
+
+    header = sock.read(5)
+    if header != ZBXD
+      return false
+    end
+    len = sock.read(8).unpack('q')[0]
+    res = Yajl::Parser.parse(sock.read(len))
+    return res['response'] == "success"
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: zabbix
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement