fluent-plugin-zabbix 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e11da95c4e09044e40845f2292db90a2d1ca7ea8
-  data.tar.gz: 54def51b590808ba75f6e6ad65532f83b2c36f3c
+  metadata.gz: 778dffb330bf90f5e65b9bab2b57ca3fb29bbee6
+  data.tar.gz: 26d030c79c0680a76a387e0edb61e2ddd9ecf5d5
 SHA512:
-  metadata.gz: 38e28be96f3102f1598705e0151c408ff6d90f4613b3a0364eaf45f3e140d15f001bae1b0dbb362c335a0a07a8405ca4e7a17697302c12f3a34e4b0263200c50
-  data.tar.gz: abdbcc01fc4a6a6a2771e9a61744ceb55bf29aad25f881c821df2f60795cf7567bcf6da247f34ec6316f473f31c242f5499f569ba165b7d4d8720d892a79bb26
+  metadata.gz: bb3f14d22487dc1b29002b447da2459ec2905e4ab46ab98a2ae779bae45fe4544444b0f2619dbca70f9a40a81bebd03ea1c08903546f41e62368761cdd2fd860
+  data.tar.gz: a198b9002377c9adb801dab673193c12f2a29964e3d3bf04bcb9eeed40cb7e5de86d3100748b8bd9ee31a55b47d28414185695271f51efc009675b29dad1e578

data/{README.rdoc → README.md}

@@ -1,14 +1,14 @@
-= fluent-plugin-zabbix
+# fluent-plugin-zabbix
 
-== Component
+## Component
 
-=== ZabbixOutput
+### ZabbixOutput
 
 Plugin to output values to Zabbix server.
 
-== Configuration
+## Configuration
 
-=== ZabbixOutput
+### ZabbixOutput
 
 Zabbix configuration of Item:
 
@@ -20,7 +20,7 @@ Zabbix configuration of Item:
 
 For messages such as:
     tag:metrics {"metrics.field1":300, "metrics.field2":20}
-    
+
     <match metrics>
       type zabbix
       zabbix_server 192.168.0.1
@@ -29,7 +29,7 @@ For messages such as:
       name_keys     metrics.field1,metrics.field2
     </match>
 
-or, use "add_key_prefix"
+or, use `add_key_prefix`
     tag:metrics {"field1":300, "field2":20}
 
     <match metrics>
@@ -52,11 +52,23 @@ If you want to specify the host(on zabbix) from record's value, use "host_key" d
       name_keys     metrics.field1,metrics.field2
     </match>
 
-== TODO
+v0.0.7~ includes [Fluent::Mixin::ConfigPlaceholders](https://github.com/tagomoris/fluent-mixin-config-placeholders). Placeholders will be expanded in a configuration.
+
+```
+<match matrics.**>
+  type             zabbix
+  zabbix_server    192.168.0.1
+  host             ${hostname}
+  add_key_prefix   ${tag}
+  name_key_pattern .
+</match>
+```
+
+# TODO
 
 - patches welcome!
 
-== Copyright
+## Copyright
 
-Copyright:: Copyright (c) 2012- FUJIWARA Shunichiro
-License::   Apache License, Version 2.0
+- Copyright: Copyright (c) 2012- FUJIWARA Shunichiro
+- License:   Apache License, Version 2.0

data/fluent-plugin-zabbix.gemspec

@@ -13,10 +13,11 @@ 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.6"
+  gem.version       = "0.0.7"
 
   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"
 end

data/lib/fluent/plugin/out_zabbix.rb

@@ -1,3 +1,5 @@
+require 'fluent/mixin/config_placeholders'
+
 class Fluent::ZabbixOutput < Fluent::Output
   Fluent::Plugin.register_output('zabbix', self)
 
@@ -17,7 +19,9 @@ class Fluent::ZabbixOutput < Fluent::Output
   config_param :name_key_pattern, :string, :default => nil
   config_param :add_key_prefix, :string,   :default => nil
 
-# Define `log` method for v0.10.42 or earlier
+  include Fluent::Mixin::ConfigPlaceholders
+
+  # Define `log` method for v0.10.42 or earlier
   unless method_defined?(:log)
     define_method("log") { $log }
   end
@@ -53,7 +57,11 @@ class Fluent::ZabbixOutput < Fluent::Output
 
   def send(host, tag, name, value, time)
     if @add_key_prefix
-      name = "#{@add_key_prefix}.#{name}"
+      if @add_key_prefix == '${tag}'
+        name = "#{tag}.#{name}"
+      else
+        name = "#{@add_key_prefix}.#{name}"
+      end
     end
     begin
       sock = TCPSocket.open(@zabbix_server, @port)

data/test/plugin/test_out_zabbix.rb

@@ -21,7 +21,7 @@ class ZabbixOutputTest < Test::Unit::TestCase
   CONFIG = %[
     zabbix_server  127.0.0.1
     host           test_host
-    add_key_prefix test
+    add_key_prefix ${tag}
     name_keys      foo, bar, baz, f1, f2
   ]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: fluent-mixin-config-placeholders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +92,7 @@ files:
 - Gemfile
 - Gemfile.fluentd.lt.0.10.43
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - fluent-plugin-zabbix.gemspec
 - lib/fluent/plugin/out_zabbix.rb