fluent-plugin-zabbix-agent 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70ea3efb9f6850bc5baaf5edfd4ba7ceaa5f2727
-  data.tar.gz: 42e89b3a717f56601aad4ba89ef46f6485ab2abf
+  metadata.gz: 27049880904ec28d2e2159623747826e6fac0b43
+  data.tar.gz: 534b50053c659cd512c11e0f651a3006116ca7ad
 SHA512:
-  metadata.gz: 0cc4ddd43188a5c2d8172e3a13c611a956b7c9f3553ceeb48c406e379e4c7cf91e16cb78667bcbaf072b9774621c8d240c9a368aca9c05bbd865feabbf4d1edd
-  data.tar.gz: d92ac6db472f9f14b2d391e1e863725349ce9a52186446bbcb5759af98578973f41b6b59f952141a7d61c092a7d18788bc4a05e5d4ba1a43a8976fe5c7338b57
+  metadata.gz: 1c2aee511111ea3bd9ecfc9fa1a862a797cb276b78680b191fc673af4b48353bdcedc05feb378c8c322d5730c7a473f530cab49f5fe51c24d9b40df2240954c7
+  data.tar.gz: 861a09d4bdca8ad495923f36d49c9b007ec857fb27b13f1eef34ab548940f14e53b6f513d5967aed9f85729af86dcd64541e52c62a1d46f501dfe97e9efd0882

data/README.md

@@ -33,6 +33,8 @@ Or install it yourself as:
   #agent_port 10050
   #interval 60
   #tag zabbix.item
+  #item_key_key key
+  #item_value_key value
   #extra {}
   #bulk false
 
@@ -66,8 +68,8 @@ Or install it yourself as:
 ```
 
 ```
-2015-01-02 12:30:40 +0000 zabbix.item: {"load_avg1":0.0,"hostname":"my-host"}
-2015-01-02 12:30:40 +0000 zabbix.item: {"system.cpu.load[all,avg5]":0.01,"hostname":"my-host"}
+2015-01-02 12:30:40 +0000 zabbix.item: {"key":"load_avg1","value":0.0,"hostname":"my-host"}
+2015-01-02 12:30:40 +0000 zabbix.item: {"key":"system.cpu.load[all,avg5]","value":0.01,"hostname":"my-host"}
 ```
 
 ## Get zabbix items as a single record

data/lib/fluent/plugin/in_zabbix_agent.rb

@@ -11,14 +11,16 @@ class Fluent::ZabbixAgentInput < Fluent::Input
     define_method('router') { Fluent::Engine }
   end
 
-  config_param :agent_host, :string,  :default => '127.0.0.1'
-  config_param :agent_port, :integer, :default => 10050
-  config_param :interval,   :time,    :default => 60
-  config_param :tag,        :string,  :default => 'zabbix.item'
-  config_param :items,      :hash,    :default => nil
-  config_param :items_file, :string,  :default => nil
-  config_param :extra,      :hash,    :default => {}
-  config_param :bulk,       :bool,    :default => false
+  config_param :agent_host,     :string,  :default => '127.0.0.1'
+  config_param :agent_port,     :integer, :default => 10050
+  config_param :interval,       :time,    :default => 60
+  config_param :tag,            :string,  :default => 'zabbix.item'
+  config_param :item_key_key,   :string,  :default => 'key'
+  config_param :item_value_key, :string,  :default => 'value'
+  config_param :items,          :hash,    :default => nil
+  config_param :items_file,     :string,  :default => nil
+  config_param :extra,          :hash,    :default => {}
+  config_param :bulk,           :bool,    :default => false
 
   def initialize
     super
@@ -119,14 +121,18 @@ class Fluent::ZabbixAgentInput < Fluent::Input
   def emit_items(value_by_item)
     time = Time.now
 
-    records = value_by_item.map do |key, value|
-      {key => value}
-    end
-
     if @bulk
+      records = value_by_item.map do |key, value|
+        {key => value}
+      end
+
       bulk_record = records.inject({}) {|r, i| r.merge(i) }
       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}
+      end
+
       records.each do |rcrd|
         router.emit(@tag, time.to_i, rcrd.merge(extra))
       end

data/lib/fluent_plugin_zabbix_agent/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginZabbixAgent
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Genki Sugawara