fluent-plugin-zabbix-agent 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9d7f2b2841901404b8aa1aed837046c9aa79f869
4
- data.tar.gz: 9d6019d70e783ad42e3202b3952e44479fdcbf2f
3
+ metadata.gz: b45abf607c6bced10d479b80b7554b72e8b5899c
4
+ data.tar.gz: 743abbd86ab81996e2eb696cfeda665204e01936
5
5
  SHA512:
6
- metadata.gz: 98334166453109edfd864d9b13cb0a14a393e6ec0dede2e1856b0427fb35b7f180b839ce2312a04447d0e4adc47e7c4d67cc83656ba057bd11abc039720b15ba
7
- data.tar.gz: adf317734eff24096edf75015c64c3b1f12f0838c3bc378b758245532c4b9ad75845ff900486224c066e18d4b64d03e5f7012e3e8e8f12608f66ff4cd5d08bff
6
+ metadata.gz: b77a5589ee51d15e1082a8128ce5d012170b05f6fd2836f2950a715741b429798b1170f798cd352a4264651b01134fa5aed32b964252a41dd19cb292f8eb9c70
7
+ data.tar.gz: 4ee48510670af790c32aef58609aafa2272932c6b598f7fe152c3b9d6ae67bb89c3ca5c5affb384dc15f59c9ef9faeecfc388f8b0b082c46a6955f51f175948c
data/README.md CHANGED
@@ -92,3 +92,20 @@ Or install it yourself as:
92
92
  ```
93
93
  2015-01-02 12:30:40 +0000 zabbix.item: {"load_avg1":0.06,"system.cpu.load[all,avg5]":0.03,"hostname":"my-server"}
94
94
  ```
95
+
96
+ ### Hash record key
97
+
98
+ ```apache
99
+ <source>
100
+ type zabbix_agent
101
+ extra {"hostname", "my-host"}
102
+ items {
103
+ "system.cpu.load[all,avg1]": {"name": "load_avg1", "source": "all"}
104
+ }
105
+ </source>
106
+
107
+ ```
108
+
109
+ ```
110
+ 2015-01-02 12:30:40 +0000 zabbix.item: {"name":"load_avg1","source":"all","value":0.0,"hostname":"my-host"}
111
+ ```
@@ -139,7 +139,11 @@ class Fluent::ZabbixAgentInput < Fluent::Input
139
139
  router.emit(@tag, time.to_i, bulk_record.merge(extra))
140
140
  else
141
141
  records = value_by_item.map do |key, value|
142
- {@item_key_key => key, @item_value_key => value}
142
+ if key.is_a?(Hash)
143
+ key.merge(@item_value_key => value)
144
+ else
145
+ {@item_key_key => key, @item_value_key => value}
146
+ end
143
147
  end
144
148
 
145
149
  records.each do |rcrd|
@@ -1,3 +1,3 @@
1
1
  module FluentPluginZabbixAgent
2
- VERSION = '0.1.5'
2
+ VERSION = '0.1.6'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-zabbix-agent
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Genki Sugawara
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2015-09-13 00:00:00.000000000 Z
11
+ date: 2015-09-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd