fluent-plugin-zabbix 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f72ffcfce03e77cff9b5181a4ebacc94d7db7b
-  data.tar.gz: 048a1130e81d421c05de2a97b81cfeeacfdef764
+  metadata.gz: 93794a2b1192debe9fee915e6dcb8db8edef4d9e
+  data.tar.gz: 711a95a9666e3542085646e7d5217d88f9c25689
 SHA512:
-  metadata.gz: 2e6ae91ae3b89670755efc4fb6393262f92b69fc102e82b012546f41eac873f638fd8e0a24feef5f5dc6218a7ec0d959b3230fe42cba34d4ead309905694e83d
-  data.tar.gz: bb5192c9d7e75aaacacba47880c1cb87d869c88ccb622a0ef73cb83e75d768eaa0606ecc5bbb911bd62858e8c7675a739a77f4bb100bbf85b6cfb7b11cd7066f
+  metadata.gz: 35372f496277a1bb6f9b8fd386f105bfeba60cad7fbf1983023c4cecfa642171768e2335c2b1083c617c05993edcc53be0079673830a6ad995abfcba9d99c87e
+  data.tar.gz: fe044b53179e08ef1c0d7be1998aa3822694e8c8c19a62d4fe325c36054d46e2064c3812081d1949dd82038d098e8a4b7326e705751ad72079aed85fe4a84805

data/.travis.yml

@@ -11,3 +11,5 @@ matrix:
   exclude:
     - rvm: 2.2
     - gemfile: Gemfile.fluentd.lt.0.10.43
+before_install:
+  - gem update bundler

data/README.md

@@ -41,6 +41,9 @@ or, use `add_key_prefix`
       name_key_pattern  ^field
     </match>
 
+If `prefix_key` is specified, a value of record[prefix_key] will be used as key prefix.
+
+
 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}

data/fluent-plugin-zabbix.gemspec

@@ -7,15 +7,16 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Output data plugin to Zabbix}
   gem.summary       = %q{Output data plugin to Zabbix (like zabbix_sender)}
   gem.homepage      = "https://github.com/fujiwara/fluent-plugin-zabbix"
+  gem.license       = "Apache-2.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-zabbix"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.0"
+  gem.version       = "0.2.0"
 
-  gem.add_runtime_dependency "fluentd", "~> 0.10"
+  gem.add_runtime_dependency "fluentd", [">= 0.10", "< 2"]
   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"

data/lib/fluent/plugin/out_zabbix.rb

@@ -18,6 +18,7 @@ class Fluent::ZabbixOutput < Fluent::Output
   config_param :name_keys, :string,        :default => nil
   config_param :name_key_pattern, :string, :default => nil
   config_param :add_key_prefix, :string,   :default => nil
+  config_param :prefix_key, :string,       :default => nil
 
   include Fluent::Mixin::ConfigPlaceholders
 
@@ -81,7 +82,7 @@ class Fluent::ZabbixOutput < Fluent::Output
         bulk = []
         @name_keys.each {|key|
           if record[key]
-            bulk.push({ :key => format_key(tag, key),
+            bulk.push({ :key => format_key(tag, key, record),
                         :value => format_value(record[key]),
                         :host => host,
                         :time => time.to_i,
@@ -96,7 +97,7 @@ class Fluent::ZabbixOutput < Fluent::Output
         bulk = []
         record.keys.each {|key|
           if @name_key_pattern.match(key) && record[key]
-            bulk.push({ :key => format_key(tag, key),
+            bulk.push({ :key => format_key(tag, key, record),
                         :value => format_value(record[key]),
                         :host => host,
                         :time => time.to_i,
@@ -123,7 +124,12 @@ class Fluent::ZabbixOutput < Fluent::Output
     return host
   end
 
-  def format_key(tag, key)
+  def format_key(tag, key, record)
+    if @prefix_key
+      if record[@prefix_key]
+        key = "#{record[@prefix_key]}.#{key}"
+      end
+    end
     if @add_key_prefix
       if @add_key_prefix == '${tag}'
         "#{tag}.#{key}"

data/test/plugin/test_out_zabbix.rb

@@ -64,6 +64,17 @@ END
     Fluent::Test::OutputTestDriver.new(Fluent::ZabbixOutput, tag).configure(conf)
   end
 
+  CONFIG_PREFIX_KEY = %[
+    zabbix_server  127.0.0.1
+    host           test_host
+    prefix_key     prefix
+    name_keys      foo, bar, baz
+  ]
+
+  def create_driver_prefix_key(conf = CONFIG_PREFIX_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']
@@ -75,6 +86,21 @@ END
       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
+
+  def test_write_prefix_key
+    d = create_driver_prefix_key
+    if ENV['LIVE_TEST']
+      d.emit({"foo" => "AAA"})
+      d.emit({"foo" => "BBB", "prefix" => "p"})
+      d.run
+      sleep 1
+      $server.stop
+      assert_equal open($dir + "/trapper.log").read, <<END
+host:test_host	key:foo	value:AAA
+host:test_host	key:p.foo	value:BBB
 END
     end
   end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-12-17 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'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +120,8 @@ files:
 - test/mockserver.go
 - test/plugin/test_out_zabbix.rb
 homepage: https://github.com/fujiwara/fluent-plugin-zabbix
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []