fluent-plugin-zabbix 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bf49b619e8d3bcfa0f2e1e456964d19d6a557b66
+  data.tar.gz: 644a96eb558d5b7abd91bf54711bf75a37f2ad0c
+SHA512:
+  metadata.gz: ed4f648a53075202cabc361d164d6b53091e25acbed2a08b6138d5c102376533fee1225a25700ab3c5534bb64bfd46f22856bc44f5f003404e54c83919927997
+  data.tar.gz: 9bb6bf01b9fe8b0cd5982890b1b2460e68343841e50abcbb1d7795365a4642a5b5c5f42b1e115d366f867f89edd44793a6bd59a2b04902cebbb0ecaf4f0f2c60

data/README.rdoc

@@ -41,6 +41,17 @@ or, use "add_keys_prefix"
       name_key_pattern  ^field
     </match>
 
+If you want to specify the host(on zabbix) from record's value, use "host_key" directive.
+
+    tag:metrics {"zabbix_host":"myhostname", "metrics.field1":300, "metrics.field2":20}
+
+    <match metrics>
+      type zabbix
+      zabbix_server 192.168.0.1
+      host_key      zabbix_host
+      name_keys     metrics.field1,metrics.field2
+    </match>
+
 == TODO
 
 - patches welcome!

data/fluent-plugin-zabbix.gemspec

@@ -13,9 +13,8 @@ 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.1"
+  gem.version       = "0.0.2"
 
-  gem.add_development_dependency "fluentd"
-  gem.add_runtime_dependency "fluentd"
-  gem.add_runtime_dependency "zabbix"
+  gem.add_runtime_dependency "fluentd", "~> 0.10"
+  gem.add_runtime_dependency "zabbix", ">= 0.4"
 end

data/lib/fluent/plugin/out_zabbix.rb

@@ -10,6 +10,7 @@ class Fluent::ZabbixOutput < Fluent::Output
   config_param :zabbix_server, :string
   config_param :port, :integer,            :default => 10051
   config_param :host, :string,             :default => Socket.gethostname
+  config_param :host_key, :string,         :default => nil
   config_param :name_keys, :string,        :default => nil
   config_param :name_key_pattern, :string, :default => nil
   config_param :add_key_prefix, :string,   :default => nil
@@ -43,45 +44,60 @@ class Fluent::ZabbixOutput < Fluent::Output
     super
   end
 
-  def send(tag, name, value, time)
+  def send(host, tag, name, value, time)
     if @add_key_prefix
       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 }
+      $log.debug("zabbix: #{zbx}, #{name}: #{value}, host: #{host}, ts: #{time}")
+      opts = { :host => host, :ts => time }
       status = zbx.send_data(name, value.to_s, opts)
 
     rescue IOError, EOFError, SystemCallError
       # server didn't respond
-      $log.warn "Zabbix::Sender.send_data raises exception: #{$!.class}, '#{$!.message}'"
+      $log.warn "plugin-zabbix: Zabbix::Sender.send_data raises exception: #{$!.class}, '#{$!.message}'"
       status = false
     end
     unless status
-      $log.warn "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}, host:#{host} '#{name}': #{value}"
     end
   end
 
   def emit(tag, es, chain)
     if @name_keys
       es.each {|time,record|
+        host = gen_host(record)
         @name_keys.each {|name|
           if record[name]
-            send(tag, name, record[name], time)
+            send(host, tag, name, record[name], time)
           end
         }
       }
     else # for name_key_pattern
       es.each {|time,record|
+        host = gen_host(record)
         record.keys.each {|key|
           if @name_key_pattern.match(key) and record[key]
-            send(tag, key, record[key], time)
+            send(host, tag, key, record[key], time)
           end
         }
       }
     end
     chain.next
   end
+
+  def gen_host(record)
+    if @host_key
+      if record[@host_key]
+        host = record[@host_key]
+      else
+        $log.warn "plugin-zabbix: host_key is configured '#{@host_key}', but this record has no such key. use host '#{@host}'"
+        host = @host
+      end
+    else
+      host = @host
+    end
+    return host
+  end
 end

data/test/plugin/test_out_zabbix.rb

@@ -7,7 +7,7 @@ class ZabbixOutputTest < Test::Unit::TestCase
 
   CONFIG = %[
     zabbix_server  127.0.0.1
-    host           clienthost
+    host           test_host
     add_key_prefix test
     name_keys      foo, bar, baz
   ]
@@ -17,9 +17,36 @@ class ZabbixOutputTest < Test::Unit::TestCase
   end
 
   def test_write
-#    d = create_driver
-#    d.emit({"foo" => "test value of foo"})
-#    d.emit({"bar" => "test value of bar"})
-#    d.emit({"baz" => rand * 10 }) 
+    d = create_driver
+    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({"foo" => "yyy", "zabbix_host" => "alternative-hostname"})
+      d.run
+    end
   end
+
+
+  CONFIG_HOST_KEY = %[
+    zabbix_server  127.0.0.1
+    host           test_host
+    host_key       host
+    add_key_prefix test
+    name_keys      foo, bar, baz
+  ]
+
+  def create_driver_host_key(conf = CONFIG_HOST_KEY, tag='test')
+    Fluent::Test::OutputTestDriver.new(Fluent::ZabbixOutput, tag).configure(conf)
+  end
+
+  def test_write_host_key
+    d = create_driver_host_key
+    if ENV['LIVE_TEST']
+      d.emit({"foo" => "AAA" })
+      d.emit({"foo" => "BBB", "host" => "alternative-hostname"})
+      d.run
+    end
+  end
+
 end

metadata

@@ -1,61 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: fluentd
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2014-01-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fluentd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: zabbix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: zabbix
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: Output data plugin to Zabbix
-email: 
+email:
 - fujiwara.shunichiro@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -66,31 +56,27 @@ files:
 - test/plugin/test_out_zabbix.rb
 homepage: https://github.com/fujiwara/fluent-plugin-zabbix
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Output data plugin to Zabbix (like zabbix_sender)
-test_files: 
+test_files:
 - test/helper.rb
 - test/plugin/test_out_zabbix.rb