fluent-plugin-zabbix-agent 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d7f2b2841901404b8aa1aed837046c9aa79f869
-  data.tar.gz: 9d6019d70e783ad42e3202b3952e44479fdcbf2f
+  metadata.gz: b45abf607c6bced10d479b80b7554b72e8b5899c
+  data.tar.gz: 743abbd86ab81996e2eb696cfeda665204e01936
 SHA512:
-  metadata.gz: 98334166453109edfd864d9b13cb0a14a393e6ec0dede2e1856b0427fb35b7f180b839ce2312a04447d0e4adc47e7c4d67cc83656ba057bd11abc039720b15ba
-  data.tar.gz: adf317734eff24096edf75015c64c3b1f12f0838c3bc378b758245532c4b9ad75845ff900486224c066e18d4b64d03e5f7012e3e8e8f12608f66ff4cd5d08bff
+  metadata.gz: b77a5589ee51d15e1082a8128ce5d012170b05f6fd2836f2950a715741b429798b1170f798cd352a4264651b01134fa5aed32b964252a41dd19cb292f8eb9c70
+  data.tar.gz: 4ee48510670af790c32aef58609aafa2272932c6b598f7fe152c3b9d6ae67bb89c3ca5c5affb384dc15f59c9ef9faeecfc388f8b0b082c46a6955f51f175948c

data/README.md

@@ -92,3 +92,20 @@ Or install it yourself as:
 ```
 2015-01-02 12:30:40 +0000 zabbix.item: {"load_avg1":0.06,"system.cpu.load[all,avg5]":0.03,"hostname":"my-server"}
 ```
+
+### Hash record key
+
+```apache
+<source>
+  type zabbix_agent
+  extra {"hostname", "my-host"}
+  items {
+    "system.cpu.load[all,avg1]": {"name": "load_avg1", "source": "all"}
+  }
+</source>
+
+```
+
+```
+2015-01-02 12:30:40 +0000 zabbix.item: {"name":"load_avg1","source":"all","value":0.0,"hostname":"my-host"}
+```

data/lib/fluent/plugin/in_zabbix_agent.rb

@@ -139,7 +139,11 @@ class Fluent::ZabbixAgentInput < Fluent::Input
       router.emit(@tag, time.to_i, bulk_record.merge(extra))
     else
       records = value_by_item.map do |key, value|
-        {@item_key_key => key, @item_value_key => value}
+        if key.is_a?(Hash)
+          key.merge(@item_value_key => value)
+        else
+          {@item_key_key => key, @item_value_key => value}
+        end
       end
 
       records.each do |rcrd|

data/lib/fluent_plugin_zabbix_agent/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginZabbixAgent
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd